X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Frmdir-errno.m4;h=1b44af7635b0046ad7e8d3f4bd1b3da0cf3a2c62;hb=41a7841a82351f9df3e13b6199a134004d694131;hp=b96bddddefda6a2c428ebc133275ebf4f9706c43;hpb=44d7c1c1f004fa9bfb8ec3948de2671a7958cf5b;p=gnulib.git

diff --git a/m4/rmdir-errno.m4 b/m4/rmdir-errno.m4
index b96bdddde..1b44af763 100644
--- a/m4/rmdir-errno.m4
+++ b/m4/rmdir-errno.m4
@@ -1,6 +1,6 @@
-#serial 4
+# serial 10
 
-# Copyright (C) 2000, 2001, Free Software Foundation, Inc.
+# Copyright (C) 2000-2001, 2005-2006, 2009-2011 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -10,39 +10,40 @@
 # ENOTEMPTY is mistakenly defined to be EEXIST.  To work around this, and
 # in general, to avoid depending on the use of any particular symbol, this
 # test runs a test to determine the actual numeric value.
-AC_DEFUN([fetish_FUNC_RMDIR_NOTEMPTY],
+AC_DEFUN([gl_FUNC_RMDIR_NOTEMPTY],
 [dnl
+  AC_CHECK_HEADERS_ONCE([unistd.h])
   AC_CACHE_CHECK([for rmdir-not-empty errno value],
-    fetish_cv_func_rmdir_errno_not_empty,
+    gl_cv_func_rmdir_errno_not_empty,
     [
       # Arrange for deletion of the temporary directory this test creates.
       ac_clean_files="$ac_clean_files confdir2"
       mkdir confdir2; : > confdir2/file
-      AC_TRY_RUN([
+      AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <stdio.h>
 #include <errno.h>
-#ifndef errno
-extern int errno;
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
 #endif
-	int main ()
-	{
-	  FILE *s;
-	  int val;
-	  rmdir ("confdir2");
-	  val = errno;
-	  s = fopen ("confdir2/errno", "w");
-	  fprintf (s, "%d\n", val);
-	  exit (0);
-	}
-	],
-      fetish_cv_func_rmdir_errno_not_empty=`cat confdir2/errno`,
-      fetish_cv_func_rmdir_errno_not_empty='configure error in rmdir-errno.m4',
-      fetish_cv_func_rmdir_errno_not_empty=ENOTEMPTY
+        int main ()
+        {
+          FILE *s;
+          int val;
+          rmdir ("confdir2");
+          val = errno;
+          s = fopen ("confdir2/errno", "w");
+          fprintf (s, "%d\n", val);
+          return 0;
+        }
+        ]])],
+      [gl_cv_func_rmdir_errno_not_empty=`cat confdir2/errno`],
+      [gl_cv_func_rmdir_errno_not_empty='configure error in rmdir-errno.m4'],
+      [gl_cv_func_rmdir_errno_not_empty=ENOTEMPTY]
       )
     ]
   )
 
   AC_DEFINE_UNQUOTED([RMDIR_ERRNO_NOT_EMPTY],
-    $fetish_cv_func_rmdir_errno_not_empty,
+    $gl_cv_func_rmdir_errno_not_empty,
     [the value to which errno is set when rmdir fails on a nonempty directory])
 ])