Mercurial > hg > octave-lojdl > gnulib-hg

changeset 3800:5504201e4f91

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(UTILS_FUNC_DIRFD): Also detect when dirfd is a macro. This is necessary at least on Darwin 5.3.
author Jim Meyering <jim@meyering.net>
date Fri, 12 Apr 2002 20:48:29 +0000
parents de0f174a2b08
children ca71bcd0c455
files m4/dirfd.m4
diffstat 1 files changed, 14 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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,9 +25,19 @@
   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*],