X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fdirfd.m4;h=efdd06718d25899b883b45476e5290baf427c86c;hb=2238bc8f821ef84c53dc823a67b4326b0b211da1;hp=9b6fb457edb14f94c5f958a1a864cd34ddac81be;hpb=400d9b8d89a4c51465bee4f747e076dc8d72985a;p=gnulib.git

diff --git a/m4/dirfd.m4 b/m4/dirfd.m4
index 9b6fb457e..efdd06718 100644
--- a/m4/dirfd.m4
+++ b/m4/dirfd.m4
@@ -1,4 +1,4 @@
-#serial 1
+#serial 2
 
 dnl Find out how to get the file descriptor associated with an open DIR*.
 dnl From Jim Meyering
@@ -25,44 +25,54 @@ AC_DEFUN([UTILS_FUNC_DIRFD],
   AC_CHECK_FUNCS(dirfd)
   AC_CHECK_DECLS([dirfd], , , $dirfd_headers)
 
-  # Use the replacement only if we have neither the function
-  # nor a declaration.
-  if test $ac_cv_func_dirfd,$ac_cv_have_decl_dirfd = no,no; then
+  AC_CACHE_CHECK([whether dirfd is a macro],
+    jm_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))
+
+  # 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 \
+      = 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_to_fd,
+		   ac_cv_sys_dir_fd_member_name,
       [
-        dirfd_save_DEFS=$DEFS
-	for ac_expr in						\
-								\
-	    'dir_p->d_fd'					\
-								\
-	    'dir_p->dd_fd'					\
-								\
-	    '# systems for which the info is not available'	\
-	    -1							\
-	    ; do
-
-	  # Skip each embedded comment.
-	  case "$ac_expr" in '#'*) continue;; esac
+        dirfd_save_CFLAGS=$CFLAGS
+	for ac_expr in d_fd dd_fd; do
 
-	  DEFS="$DEFS -DDIR_TO_FD=$ac_expr"
+	  CFLAGS="$CFLAGS -DDIR_FD_MEMBER_NAME=$ac_expr"
 	  AC_TRY_COMPILE(
 	    [$dirfd_headers
 	    ],
-	    [DIR *dir_p = opendir("."); (void) ($ac_expr);],
-	    dir_fd_done=yes
+	    [DIR *dir_p = opendir("."); (void) dir_p->DIR_FD_MEMBER_NAME;],
+	    dir_fd_found=yes
 	  )
-	  DEFS=$dirfd_save_DEFS
-	  test "$dir_fd_done" = yes && break
+	  CFLAGS=$dirfd_save_CFLAGS
+	  test "$dir_fd_found" = yes && break
 	done
+	test "$dir_fd_found" = yes || ac_expr=-1
 
-	ac_cv_sys_dir_to_fd=$ac_expr
+	ac_cv_sys_dir_fd_member_name=$ac_expr
       ]
     )
-    AC_DEFINE_UNQUOTED(DIR_TO_FD,
-      $ac_cv_sys_dir_to_fd,
-      [the file descriptor associated with `dir_p'])
+    if test $ac_cv_have_decl_dirfd = -1; then
+      AC_DEFINE_UNQUOTED(DIR_FD_MEMBER_NAME,
+	$ac_cv_sys_dir_fd_member_name,
+	[the name of the file descriptor member of DIR])
+    fi
+    AH_VERBATIM(DIR_TO_FD,
+		[#ifdef DIR_FD_MEMBER_NAME
+# define DIR_TO_FD(Dir_p) ((Dir_p)->DIR_FD_MEMBER_NAME)
+#else
+# define DIR_TO_FD(Dir_p) -1
+#endif
+]
+    )
   fi
 ])