X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Frmdir.m4;h=c5f24cda5829a2d0ed38ce5159d3eb20f0da178b;hb=270e2d3e2966d9a5bc16dd0b367b71740b8994d5;hp=41705a1ee442b7ae8bdfac2d993ab702d609176f;hpb=3d50b6043ac61690f0b163a1618cfd5516238c81;p=gnulib.git

diff --git a/m4/rmdir.m4 b/m4/rmdir.m4
index 41705a1ee..c5f24cda5 100644
--- a/m4/rmdir.m4
+++ b/m4/rmdir.m4
@@ -1,5 +1,5 @@
-# rmdir.m4 serial 10
-dnl Copyright (C) 2002, 2005, 2009-2011 Free Software Foundation, Inc.
+# rmdir.m4 serial 12
+dnl Copyright (C) 2002, 2005, 2009-2012 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -8,6 +8,7 @@ AC_DEFUN([gl_FUNC_RMDIR],
 [
   AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
   dnl Detect cygwin 1.5.x bug.
+  AC_CHECK_HEADERS_ONCE([unistd.h])
   AC_CACHE_CHECK([whether rmdir works], [gl_cv_func_rmdir_works],
     [mkdir conftest.dir
      touch conftest.file
@@ -15,7 +16,11 @@ AC_DEFUN([gl_FUNC_RMDIR],
        [AC_LANG_PROGRAM(
          [[#include <stdio.h>
            #include <errno.h>
-           #include <unistd.h>
+           #if HAVE_UNISTD_H
+           # include <unistd.h>
+           #else /* on Windows with MSVC */
+           # include <direct.h>
+           #endif
 ]], [[int result = 0;
       if (!rmdir ("conftest.file/"))
         result |= 1;
@@ -30,6 +35,5 @@ AC_DEFUN([gl_FUNC_RMDIR],
      rm -rf conftest.dir conftest.file])
   if test x"$gl_cv_func_rmdir_works" != xyes; then
     REPLACE_RMDIR=1
-    AC_LIBOBJ([rmdir])
   fi
 ])