Merge from coreutils.

[gnulib.git] / m4 / rmdir-errno.m4

diff --git a/m4/rmdir-errno.m4 b/m4/rmdir-errno.m4
index b96bddd..8a417fa 100644 (file)
--- a/m4/rmdir-errno.m4
+++ b/m4/rmdir-errno.m4
@@ -1,6 +1,6 @@
-#serial 4
+#serial 5
 
-# Copyright (C) 2000, 2001, Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2005 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,10 +10,10 @@
 # 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_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"
@@ -35,14 +35,14 @@ extern int errno;
          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
+      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])
 ])