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

diff --git a/m4/dirfd.m4 b/m4/dirfd.m4
index 16f54d4c3..db2a9a0ed 100644
--- a/m4/dirfd.m4
+++ b/m4/dirfd.m4
@@ -1,10 +1,18 @@
-#serial 5
+#serial 10
 
 dnl Find out how to get the file descriptor associated with an open DIR*.
+
+# Copyright (C) 2001, 2002, 2003, 2004, 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.
+
 dnl From Jim Meyering
 
-AC_DEFUN([UTILS_FUNC_DIRFD],
+AC_DEFUN([gl_FUNC_DIRFD],
 [
+  AC_LIBSOURCES([dirfd.c, dirfd.h])
+
   dnl Work around a bug of AC_EGREP_CPP in autoconf-2.57.
   AC_REQUIRE([AC_PROG_CPP])
   AC_REQUIRE([AC_PROG_EGREP])
@@ -30,22 +38,22 @@ AC_DEFUN([UTILS_FUNC_DIRFD],
   AC_CHECK_DECLS([dirfd], , , $dirfd_headers)
 
   AC_CACHE_CHECK([whether dirfd is a macro],
-    jm_cv_func_dirfd_macro,
+    gl_cv_func_dirfd_macro,
     [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)])
+       gl_cv_func_dirfd_macro=yes,
+       gl_cv_func_dirfd_macro=no)])
 
   # Use the replacement only if we have no function, macro,
   # or declaration with that name.
-  if test $ac_cv_func_dirfd,$ac_cv_have_decl_dirfd,$jm_cv_func_dirfd_macro \
+  if test $ac_cv_func_dirfd,$ac_cv_have_decl_dirfd,$gl_cv_func_dirfd_macro \
       = no,no,no; then
     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 +68,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,
@@ -76,7 +84,6 @@ AC_DEFUN([UTILS_FUNC_DIRFD],
 #else
 # define DIR_TO_FD(Dir_p) -1
 #endif
-]
-    )
+])
   fi
 ])