From: Jim Meyering <jim@meyering.net>
Date: Tue, 18 Mar 2003 15:40:34 +0000 (+0000)
Subject: .
X-Git-Tag: v4.5.11~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8be6d87354945e3fbc5a4c4b9eeb424e945bd188;p=thirdparty%2Fcoreutils.git

.
---

diff --git a/aclocal.m4 b/aclocal.m4
index 2e23779fe6..4246db4e6b 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -2525,7 +2525,7 @@ AC_DEFUN([AC_FUNC_GETCWD_NULL],
 	       [Define if getcwd (NULL, 0) allocates memory for result.])
    fi])
 
-#serial 4
+#serial 5
 
 dnl Find out how to get the file descriptor associated with an open DIR*.
 dnl From Jim Meyering
@@ -2572,7 +2572,7 @@ AC_DEFUN([UTILS_FUNC_DIRFD],
     AC_REPLACE_FUNCS([dirfd])
     AC_CACHE_CHECK(
 	      [how to get the file descriptor associated with an open DIR*],
-		   ac_cv_sys_dir_fd_member_name,
+		   gl_cv_sys_dir_fd_member_name,
       [
         dirfd_save_CFLAGS=$CFLAGS
 	for ac_expr in d_fd dd_fd; do
@@ -2587,14 +2587,14 @@ AC_DEFUN([UTILS_FUNC_DIRFD],
 	  CFLAGS=$dirfd_save_CFLAGS
 	  test "$dir_fd_found" = yes && break
 	done
-	test "$dir_fd_found" = yes || ac_expr=-1
+	test "$dir_fd_found" = yes || ac_expr=no_such_member
 
-	ac_cv_sys_dir_fd_member_name=$ac_expr
+	gl_cv_sys_dir_fd_member_name=$ac_expr
       ]
     )
-    if test $ac_cv_have_decl_dirfd = no; then
+    if test $gl_cv_sys_dir_fd_member_name != no_such_member; then
       AC_DEFINE_UNQUOTED(DIR_FD_MEMBER_NAME,
-	$ac_cv_sys_dir_fd_member_name,
+	$gl_cv_sys_dir_fd_member_name,
 	[the name of the file descriptor member of DIR])
     fi
     AH_VERBATIM(DIR_TO_FD,