Make the generated glob.h self-contained.

diff --git a/ChangeLog b/ChangeLog
index 83473a8ea1d4c325be99f6f4bcea86dae2a64243..7149ef400d20246d937f4801b01b0f246172a78e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-01  Bruno Haible  <bruno@clisp.org>
+
+       * lib/glob_.h: Test HAVE_SYS_CDEFS_H at configure time.
+       * m4/glob.m4 (gl_PREREQ_GLOB): Substitute HAVE_SYS_CDEFS_H via AC_SUBST.
+       * modules/glob (Makefile.am): Put HAVE_SYS_CDEFS_H value into glob.h.
+
 2007-05-01  Bruno Haible  <bruno@clisp.org>
 
        * doc/header/assert.texi: Undo last change: don't mention the gnulib

diff --git a/lib/glob_.h b/lib/glob_.h
index 227da7ce53cb8ca2bb30c00382d3465433cacf36..451b111e22e2e4430fd5a6342db5cd3d3ca9db51 100644 (file)
--- a/lib/glob_.h
+++ b/lib/glob_.h
@@ -21,7 +21,7 @@
 #ifndef _GL_GLOB_H
 #define _GL_GLOB_H
 
-#ifdef HAVE_SYS_CDEFS_H
+#if @HAVE_SYS_CDEFS_H@
 # include <sys/cdefs.h>
 #endif
 

diff --git a/m4/glob.m4 b/m4/glob.m4
index 767c54d7add9f90bf6634d4e84a6bfb4ddd72357..32c2fee3960609522f9054f38c3048e8599d96d9 100644 (file)
--- a/m4/glob.m4
+++ b/m4/glob.m4
@@ -1,5 +1,5 @@
-# glob.m4 serial 7
-dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+# glob.m4 serial 8
+dnl Copyright (C) 2005-2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -71,9 +71,16 @@ if (glob ("conf*-globtest", 0, NULL, &found) == GLOB_NOMATCH) return 1;]]),
 
 # Prerequisites of lib/glob.*.
 AC_DEFUN([gl_PREREQ_GLOB],
-[ AC_REQUIRE([gl_CHECK_TYPE_STRUCT_DIRENT_D_TYPE])dnl
+[
+  AC_REQUIRE([gl_CHECK_TYPE_STRUCT_DIRENT_D_TYPE])dnl
   AC_REQUIRE([AC_C_RESTRICT])dnl
   AC_REQUIRE([AC_GNU_SOURCE])dnl
   AC_CHECK_HEADERS_ONCE([sys/cdefs.h unistd.h])dnl
   AC_CHECK_FUNCS_ONCE([getlogin_r getpwnam_r])dnl
-  :])
+  if test $ac_cv_header_sys_cdefs_h = yes; then
+    HAVE_SYS_CDEFS_H=1
+  else
+    HAVE_SYS_CDEFS_H=0
+  fi
+  AC_SUBST([HAVE_SYS_CDEFS_H])
+])

diff --git a/modules/glob b/modules/glob
index b4614bde3c19cead2170875955e54e07fa8a992b..cc760fcf57a42a3a873da8ce013fb7c4e08d9976 100644 (file)
--- a/modules/glob
+++ b/modules/glob
@@ -30,7 +30,8 @@ BUILT_SOURCES += $(GLOB_H)
 # doesn't have one that works with the given compiler.
 glob.h: glob_.h
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         cat $(srcdir)/glob_.h; \
+         sed -e 's|@''HAVE_SYS_CDEFS_H''@|$(HAVE_SYS_CDEFS_H)|g' \
+             < $(srcdir)/glob_.h; \
        } > $@-t
        mv -f $@-t $@
 MOSTLYCLEANFILES += glob.h glob.h-t