X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Frmdir.m4;h=41705a1ee442b7ae8bdfac2d993ab702d609176f;hb=9c3746f;hp=a8a113eef03846b2bf4ff5766f9c6d4c4df04162;hpb=fc949c66bf0513d567cca10fcff6fb99316a632a;p=gnulib.git

diff --git a/m4/rmdir.m4 b/m4/rmdir.m4
index a8a113eef..41705a1ee 100644
--- a/m4/rmdir.m4
+++ b/m4/rmdir.m4
@@ -1,12 +1,11 @@
-# rmdir.m4 serial 8
-dnl Copyright (C) 2002, 2005, 2009-2010 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_REQUIRE([gl_AC_DOS])
   AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
   dnl Detect cygwin 1.5.x bug.
   AC_CACHE_CHECK([whether rmdir works], [gl_cv_func_rmdir_works],
@@ -17,8 +16,15 @@ AC_DEFUN([gl_FUNC_RMDIR],
          [[#include <stdio.h>
            #include <errno.h>
            #include <unistd.h>
-]], [[return !rmdir ("conftest.file/") || errno != ENOTDIR
-       || !rmdir ("conftest.dir/./");]])],
+]], [[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])