X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Frmdir.m4;h=41705a1ee442b7ae8bdfac2d993ab702d609176f;hb=d5df3358bd3ae257b342d03796dbd02e24638cf2;hp=91eff7fdbf9727ff564fab8c3b84217fb7e2584e;hpb=44d7c1c1f004fa9bfb8ec3948de2671a7958cf5b;p=gnulib.git

diff --git a/m4/rmdir.m4 b/m4/rmdir.m4
index 91eff7fdb..41705a1ee 100644
--- a/m4/rmdir.m4
+++ b/m4/rmdir.m4
@@ -1,19 +1,35 @@
-# rmdir.m4 serial 2
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
+# rmdir.m4 serial 10
+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_REPLACE_FUNCS(rmdir)
-  if test $ac_cv_func_rmdir = no; then
-    gl_PREREQ_RMDIR
+  AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
+  dnl Detect cygwin 1.5.x bug.
+  AC_CACHE_CHECK([whether rmdir works], [gl_cv_func_rmdir_works],
+    [mkdir conftest.dir
+     touch conftest.file
+     AC_RUN_IFELSE(
+       [AC_LANG_PROGRAM(
+         [[#include <stdio.h>
+           #include <errno.h>
+           #include <unistd.h>
+]], [[int result = 0;
+      if (!rmdir ("conftest.file/"))
+        result |= 1;
+      else if (errno != ENOTDIR)
+        result |= 2;
+      if (!rmdir ("conftest.dir/./"))
+        result |= 4;
+      return result;
+    ]])],
+       [gl_cv_func_rmdir_works=yes], [gl_cv_func_rmdir_works=no],
+       [gl_cv_func_rmdir_works="guessing no"])
+     rm -rf conftest.dir conftest.file])
+  if test x"$gl_cv_func_rmdir_works" != xyes; then
+    REPLACE_RMDIR=1
+    AC_LIBOBJ([rmdir])
   fi
 ])
-
-# Prerequisites of lib/rmdir.c.
-AC_DEFUN([gl_PREREQ_RMDIR], [
-  AC_REQUIRE([AC_HEADER_STAT])
-  :
-])