refresh 01-gnulib-directory.patch

[gnulib.git] / m4 / rmdir.m4

diff --git a/m4/rmdir.m4 b/m4/rmdir.m4
index 9c93089..0b1a65c 100644 (file)
--- a/m4/rmdir.m4
+++ b/m4/rmdir.m4
@@ -1,14 +1,14 @@
-# rmdir.m4 serial 9
-dnl Copyright (C) 2002, 2005, 2009-2010 Free Software Foundation, Inc.
+# rmdir.m4 serial 12
+dnl Copyright (C) 2002, 2005, 2009-2011 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.
 
 AC_DEFUN([gl_FUNC_RMDIR],
 [
-  AC_REQUIRE([gl_AC_DOS])
   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
@@ -16,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;
@@ -31,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
 ])