X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fdirfd.m4;h=a13299f5efd1e7c1ca46e22398bc398fd5e3061e;hb=6ae064ff870571ee82f7d0cca2bb5d522e8e5dfa;hp=16f54d4c3a11cb895584ed4385578690b905990f;hpb=1dbb5967ee7e786d08d728e6f53f3b67026c1e7a;p=gnulib.git

diff --git a/m4/dirfd.m4 b/m4/dirfd.m4
index 16f54d4c3..a13299f5e 100644
--- a/m4/dirfd.m4
+++ b/m4/dirfd.m4
@@ -1,4 +1,4 @@
-#serial 5
+#serial 6
 
 dnl Find out how to get the file descriptor associated with an open DIR*.
 dnl From Jim Meyering
@@ -45,7 +45,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
@@ -60,14 +60,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,