diff options
| author | Bruno Haible <bruno@clisp.org> | 2007-05-01 15:48:24 +0000 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2007-05-01 15:48:24 +0000 |
| commit | 1ce45f05ab59644470d7588d054fb27d96f8d980 (patch) | |
| tree | 3eb25d0abf29db36205975de9fc365dd8ba72431 | |
| parent | bc8ce8fe7f5b728e0ca4b524948f0cba1c962123 (diff) | |
| download | gnulib-1ce45f05ab59644470d7588d054fb27d96f8d980.tar.gz | |
Make the generated glob.h self-contained.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/glob_.h | 2 | ||||
| -rw-r--r-- | m4/glob.m4 | 15 | ||||
| -rw-r--r-- | modules/glob | 3 |
4 files changed, 20 insertions, 6 deletions
@@ -1,5 +1,11 @@ 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 'assert' module here. diff --git a/lib/glob_.h b/lib/glob_.h index 227da7ce53..451b111e22 100644 --- 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 767c54d7ad..32c2fee396 100644 --- 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 b4614bde3c..cc760fcf57 100644 --- 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 |