X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Frmdir-errno.m4;h=2907e7b34afd943a3f4cd732d772c69396aeae53;hb=cf357e415055e3979d0f0d72b3046022f4bb7812;hp=1f4f21fba7d71503fd0280b6cb5da9df53455fd9;hpb=3b40119c155746325a49d9c4e1e465c50b7cef67;p=gnulib.git diff --git a/m4/rmdir-errno.m4 b/m4/rmdir-errno.m4 index 1f4f21fba..2907e7b34 100644 --- a/m4/rmdir-errno.m4 +++ b/m4/rmdir-errno.m4 @@ -1,14 +1,19 @@ -#serial 2 +#serial 7 + +# Copyright (C) 2000, 2001, 2005, 2006 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. # When rmdir fails because the specified directory is not empty, it sets # errno to some value, usually ENOTEMPTY. However, on some AIX systems, # 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" @@ -16,9 +21,6 @@ AC_DEFUN(fetish_FUNC_RMDIR_NOTEMPTY, AC_TRY_RUN([ #include #include -#ifndef errno -extern int errno; -#endif int main () { FILE *s; @@ -27,17 +29,17 @@ extern int errno; val = errno; s = fopen ("confdir2/errno", "w"); fprintf (s, "%d\n", val); - exit (0); + return 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]) ])