update from prep

[gnulib.git] / m4 / dirfd.m4

diff --git a/m4/dirfd.m4 b/m4/dirfd.m4
index 27914de..a13299f 100644 (file)
--- a/m4/dirfd.m4
+++ b/m4/dirfd.m4
@@ -1,4 +1,4 @@
-#serial 3
+#serial 6
 
 dnl Find out how to get the file descriptor associated with an open DIR*.
 dnl From Jim Meyering
@@ -31,12 +31,12 @@ AC_DEFUN([UTILS_FUNC_DIRFD],
 
   AC_CACHE_CHECK([whether dirfd is a macro],
     jm_cv_func_dirfd_macro,
-    AC_EGREP_CPP([dirent_header_defines_dirfd], [$dirfd_headers
+    [AC_EGREP_CPP([dirent_header_defines_dirfd], [$dirfd_headers
 #ifdef dirfd
  dirent_header_defines_dirfd
 #endif],
-      jm_cv_func_dirfd_macro=yes,
-      jm_cv_func_dirfd_macro=no))
+       jm_cv_func_dirfd_macro=yes,
+       jm_cv_func_dirfd_macro=no)])
 
   # Use the replacement only if we have no function, macro,
   # or declaration with that name.
@@ -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 = -1; 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,