Merge commit '039ae97'

[gnulib.git] / m4 / dirent_h.m4

diff --git a/m4/dirent_h.m4 b/m4/dirent_h.m4
index 16d8a02..481212b 100644 (file)
--- a/m4/dirent_h.m4
+++ b/m4/dirent_h.m4
@@ -1,4 +1,4 @@
-# dirent_h.m4 serial 5
+# dirent_h.m4 serial 7
 dnl Copyright (C) 2008-2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -12,6 +12,8 @@ AC_DEFUN([gl_DIRENT_H],
   dnl once only, before all statements that occur in other macros.
   AC_REQUIRE([gl_DIRENT_H_DEFAULTS])
 
+  dnl Execute this unconditionally, because DIRENT_H may be set by other
+  dnl modules, after this code is executed.
   gl_CHECK_NEXT_HEADERS([dirent.h])
 ])
 
@@ -32,16 +34,17 @@ AC_DEFUN([gl_DIRENT_MODULE_INDICATOR],
 AC_DEFUN([gl_DIRENT_H_DEFAULTS],
 [
   AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) dnl for REPLACE_FCHDIR
-  GNULIB_DIRFD=0;     AC_SUBST([GNULIB_DIRFD])
-  GNULIB_FDOPENDIR=0; AC_SUBST([GNULIB_FDOPENDIR])
-  GNULIB_SCANDIR=0;   AC_SUBST([GNULIB_SCANDIR])
-  GNULIB_ALPHASORT=0; AC_SUBST([GNULIB_ALPHASORT])
+  GNULIB_DIRFD=0;       AC_SUBST([GNULIB_DIRFD])
+  GNULIB_FDOPENDIR=0;   AC_SUBST([GNULIB_FDOPENDIR])
+  GNULIB_SCANDIR=0;     AC_SUBST([GNULIB_SCANDIR])
+  GNULIB_ALPHASORT=0;   AC_SUBST([GNULIB_ALPHASORT])
   dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_DECL_DIRFD=1;  AC_SUBST([HAVE_DECL_DIRFD])
-  HAVE_FDOPENDIR=1;   AC_SUBST([HAVE_FDOPENDIR])
-  HAVE_SCANDIR=1;     AC_SUBST([HAVE_SCANDIR])
-  HAVE_ALPHASORT=1;   AC_SUBST([HAVE_ALPHASORT])
-  REPLACE_CLOSEDIR=0; AC_SUBST([REPLACE_CLOSEDIR])
-  REPLACE_OPENDIR=0;  AC_SUBST([REPLACE_OPENDIR])
-  DIRENT_H='';        AC_SUBST([DIRENT_H])
+  HAVE_DECL_DIRFD=1;    AC_SUBST([HAVE_DECL_DIRFD])
+  HAVE_FDOPENDIR=1;     AC_SUBST([HAVE_FDOPENDIR])
+  HAVE_SCANDIR=1;       AC_SUBST([HAVE_SCANDIR])
+  HAVE_ALPHASORT=1;     AC_SUBST([HAVE_ALPHASORT])
+  REPLACE_CLOSEDIR=0;   AC_SUBST([REPLACE_CLOSEDIR])
+  REPLACE_FDOPENDIR=0;  AC_SUBST([REPLACE_FDOPENDIR])
+  REPLACE_OPENDIR=0;    AC_SUBST([REPLACE_OPENDIR])
+  DIRENT_H='';          AC_SUBST([DIRENT_H])
 ])