From b6a9d33ee89de0a0f7bf482449339e97cbbbdaef Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 21 Jun 2007 04:39:09 +0000 Subject: [PATCH] * m4/include_next.m4 (gl_INCLUDE_NEXT): Define and AC_SUBST INCLUDE_NEXT. (gl_CHECK_NEXT_HEADERS): New macro. * m4/fcntl_h.m4 (gl_FCNTL_H): use gl_CHECK_NEXT_HEADERS instead of the obsolescent gl_ABSOLUTE_HEADER. * m4/float_h.m4 (gl_FLOAT_H): Likewise. * m4/inttypes.m4 (gl_INTTYPES_H): Likewise. * m4/math_h.m4 (gl_MATH_H): Likewise. * m4/search_h.m4 (gl_SEARCH_H): Likewise. * m4/signal_h.m4 (gl_SIGNAL_H): Likewise. * m4/stdint.m4 (gl_STDINT_H): Likewise. * m4/stdio_h.m4 (gl_STDIO_H): Likewise. * m4/stdlib_h.m4 (gl_STDLIB_H): Likewise. * m4/string_h.m4 (gl_HEADER_STRING_H_BODY): Likewise. * m4/sys_stat_h.m4 (gl_HEADER_SYS_STAT_H): Likewise. * m4/sys_time_h.m4 (gl_HEADER_SYS_TIME_H_BODY): Likewise. * m4/time_h.m4 (gl_HEADER_TIME_H_BODY): Likewise. * m4/unistd_h.m4 (gl_UNISTD_H): Likewise. * m4/wchar.m4 (gl_WCHAR_H): Likewise. * m4/wctype.m4 (gl_WCTYPE_H): Likewise. * m4/inttypes.m4 (gl_INTTYPES_H): Define _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H to avoid the problem of unclean builds, since ABSOLUTE_INTTYPES_H is no longer being defined. * m4/stdint.m4 (gl_STDINT_H): Likewise, for _GL_JUST_INCLUDE_SYSTEM_STDINT_H. * lib/fcntl_.h: Use @INCLUDE_NEXT@ @NEXT_foo_H@ rather than @HAVE_INCLUDE_NEXT@ and @ABSOLUTE_foo_H@. * lib/float_.h: Likewise. * lib/inttypes_.h: Likewise. * lib/math_.h: Likewise. * lib/search_.h: Likewise. * lib/signal_.h: Likewise. * lib/stdint_.h: Likewise. * lib/stdio_.h: Likewise. * lib/stdlib_.h: Likewise. * lib/string_.h: Likewise. * lib/sys_stat_.h: Likewise. * lib/sys_time_.h: Likewise. * lib/time_.h: Likewise. * lib/unistd_.h: Likewise. * lib/wchar_.h: Likewise. * lib/wctype_.h: Likewise. * modules/fcntl (Depends-on): Depend on absolute-header, not include_next. (Makefile): Substitute INCLUDE_NEXT and NEXT_foo_H, not HAVE_INCLUDE_NEXT and ABSOLUTE_foo_H. * modules/float: Likewise. * modules/inttypes: Likewise. * modules/math: Likewise. * modules/search: Likewise. * modules/signal: Likewise. * modules/stdint: Likewise. * modules/stdio: Likewise. * modules/stdlib: Likewise. * modules/string: Likewise. * modules/sys_stat: Likewise. * modules/sys_time: Likewise. * modules/time: Likewise. * modules/unistd: Likewise. * modules/wchar: Likewise. * modules/wctype: Likewise. * modules/sys_stat: Change maintainer to "all". * modules/unistd: Likewise. --- ChangeLog | 66 ++++++++++++++++++++++++++++++++++++++++++ lib/fcntl_.h | 6 +--- lib/float_.h | 6 +--- lib/inttypes_.h | 12 +++----- lib/math_.h | 6 +--- lib/search_.h | 6 +--- lib/signal_.h | 12 ++------ lib/stdint_.h | 12 +++----- lib/stdio_.h | 12 ++------ lib/stdlib_.h | 12 ++------ lib/string_.h | 6 +--- lib/sys_stat_.h | 6 +--- lib/sys_time_.h | 6 +--- lib/time_.h | 12 ++------ lib/unistd_.h | 6 +--- lib/wchar_.h | 6 +--- lib/wctype_.h | 6 +--- m4/fcntl_h.m4 | 6 ++-- m4/float_h.m4 | 6 ++-- m4/include_next.m4 | 84 ++++++++++++++++++++++++++++++++++++++++++++++-------- m4/inttypes.m4 | 14 +++------ m4/math_h.m4 | 6 ++-- m4/search_h.m4 | 7 ++--- m4/signal_h.m4 | 6 ++-- m4/stdint.m4 | 16 ++++------- m4/stdio_h.m4 | 6 ++-- m4/stdlib_h.m4 | 6 ++-- m4/string_h.m4 | 4 +-- m4/sys_stat_h.m4 | 6 ++-- m4/sys_time_h.m4 | 6 +--- m4/time_h.m4 | 4 +-- m4/unistd_h.m4 | 7 ++--- m4/wchar.m4 | 6 ++-- m4/wctype.m4 | 7 ++--- modules/fcntl | 6 ++-- modules/float | 6 ++-- modules/inttypes | 6 ++-- modules/math | 6 ++-- modules/search | 6 ++-- modules/signal | 6 ++-- modules/stdint | 6 ++-- modules/stdio | 6 ++-- modules/stdlib | 4 +-- modules/string | 6 ++-- modules/sys_stat | 8 +++--- modules/sys_time | 6 ++-- modules/time | 6 ++-- modules/unistd | 8 +++--- modules/wchar | 6 ++-- modules/wctype | 6 ++-- 50 files changed, 248 insertions(+), 245 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6682536bc..a16da1213 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,69 @@ +2007-06-20 Paul Eggert + + * m4/include_next.m4 (gl_INCLUDE_NEXT): Define and AC_SUBST + INCLUDE_NEXT. + (gl_CHECK_NEXT_HEADERS): New macro. + * m4/fcntl_h.m4 (gl_FCNTL_H): use gl_CHECK_NEXT_HEADERS instead of + the obsolescent gl_ABSOLUTE_HEADER. + * m4/float_h.m4 (gl_FLOAT_H): Likewise. + * m4/inttypes.m4 (gl_INTTYPES_H): Likewise. + * m4/math_h.m4 (gl_MATH_H): Likewise. + * m4/search_h.m4 (gl_SEARCH_H): Likewise. + * m4/signal_h.m4 (gl_SIGNAL_H): Likewise. + * m4/stdint.m4 (gl_STDINT_H): Likewise. + * m4/stdio_h.m4 (gl_STDIO_H): Likewise. + * m4/stdlib_h.m4 (gl_STDLIB_H): Likewise. + * m4/string_h.m4 (gl_HEADER_STRING_H_BODY): Likewise. + * m4/sys_stat_h.m4 (gl_HEADER_SYS_STAT_H): Likewise. + * m4/sys_time_h.m4 (gl_HEADER_SYS_TIME_H_BODY): Likewise. + * m4/time_h.m4 (gl_HEADER_TIME_H_BODY): Likewise. + * m4/unistd_h.m4 (gl_UNISTD_H): Likewise. + * m4/wchar.m4 (gl_WCHAR_H): Likewise. + * m4/wctype.m4 (gl_WCTYPE_H): Likewise. + * m4/inttypes.m4 (gl_INTTYPES_H): Define + _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H to avoid the problem of unclean + builds, since ABSOLUTE_INTTYPES_H is no longer being defined. + * m4/stdint.m4 (gl_STDINT_H): Likewise, for + _GL_JUST_INCLUDE_SYSTEM_STDINT_H. + * lib/fcntl_.h: Use @INCLUDE_NEXT@ @NEXT_foo_H@ + rather than @HAVE_INCLUDE_NEXT@ and @ABSOLUTE_foo_H@. + * lib/float_.h: Likewise. + * lib/inttypes_.h: Likewise. + * lib/math_.h: Likewise. + * lib/search_.h: Likewise. + * lib/signal_.h: Likewise. + * lib/stdint_.h: Likewise. + * lib/stdio_.h: Likewise. + * lib/stdlib_.h: Likewise. + * lib/string_.h: Likewise. + * lib/sys_stat_.h: Likewise. + * lib/sys_time_.h: Likewise. + * lib/time_.h: Likewise. + * lib/unistd_.h: Likewise. + * lib/wchar_.h: Likewise. + * lib/wctype_.h: Likewise. + * modules/fcntl (Depends-on): Depend on absolute-header, not + include_next. + (Makefile): Substitute INCLUDE_NEXT and NEXT_foo_H, not + HAVE_INCLUDE_NEXT and ABSOLUTE_foo_H. + * modules/float: Likewise. + * modules/inttypes: Likewise. + * modules/math: Likewise. + * modules/search: Likewise. + * modules/signal: Likewise. + * modules/stdint: Likewise. + * modules/stdio: Likewise. + * modules/stdlib: Likewise. + * modules/string: Likewise. + * modules/sys_stat: Likewise. + * modules/sys_time: Likewise. + * modules/time: Likewise. + * modules/unistd: Likewise. + * modules/wchar: Likewise. + * modules/wctype: Likewise. + * modules/sys_stat: Change maintainer to "all". + * modules/unistd: Likewise. + 2007-06-20 Karl Berry * config/srclist.txt: track www changes in license files. diff --git a/lib/fcntl_.h b/lib/fcntl_.h index 1330cde7b..21f73d7e2 100644 --- a/lib/fcntl_.h +++ b/lib/fcntl_.h @@ -24,11 +24,7 @@ #include #include /* The include_next requires a split double-inclusion guard. */ -#if @HAVE_INCLUDE_NEXT@ -# include_next -#else -# include @ABSOLUTE_FCNTL_H@ -#endif +#@INCLUDE_NEXT@ @NEXT_FCNTL_H@ #ifndef _GL_FCNTL_H #define _GL_FCNTL_H diff --git a/lib/float_.h b/lib/float_.h index d898d85ad..d61d630b1 100644 --- a/lib/float_.h +++ b/lib/float_.h @@ -19,11 +19,7 @@ #ifndef _GL_FLOAT_H /* The include_next requires a split double-inclusion guard. */ -#if @HAVE_INCLUDE_NEXT@ -# include_next -#else -# include @ABSOLUTE_FLOAT_H@ -#endif +#@INCLUDE_NEXT@ @NEXT_FLOAT_H@ #ifndef _GL_FLOAT_H #define _GL_FLOAT_H diff --git a/lib/inttypes_.h b/lib/inttypes_.h index 6d78325fc..5257275fd 100644 --- a/lib/inttypes_.h +++ b/lib/inttypes_.h @@ -25,17 +25,13 @@ has not been included yet or if this file includes gnulib stdint.h which in turn includes this file. The include_next requires a split double-inclusion guard. */ -#if ! defined INTTYPES_H || defined _GL_JUST_INCLUDE_ABSOLUTE_INTTYPES_H +#if ! defined INTTYPES_H || defined _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H # if @HAVE_INTTYPES_H@ -# if @HAVE_INCLUDE_NEXT@ -# include_next -# else -# include @ABSOLUTE_INTTYPES_H@ -# endif +# @INCLUDE_NEXT@ @NEXT_INTTYPES_H@ # endif #endif -#if ! defined INTTYPES_H && ! defined _GL_JUST_INCLUDE_ABSOLUTE_INTTYPES_H +#if ! defined INTTYPES_H && ! defined _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H #define INTTYPES_H /* Include or the gnulib replacement. */ @@ -1097,4 +1093,4 @@ extern uintmax_t strtoumax (const char *, char **, int); } #endif -#endif /* INTTYPES_H */ +#endif /* !defined INTTYPES_H && !defined _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H */ diff --git a/lib/math_.h b/lib/math_.h index ed4a0eeca..5138c95c7 100644 --- a/lib/math_.h +++ b/lib/math_.h @@ -19,11 +19,7 @@ #ifndef _GL_MATH_H /* The include_next requires a split double-inclusion guard. */ -#if @HAVE_INCLUDE_NEXT@ -# include_next -#else -# include @ABSOLUTE_MATH_H@ -#endif +#@INCLUDE_NEXT@ @NEXT_MATH_H@ #ifndef _GL_MATH_H #define _GL_MATH_H diff --git a/lib/search_.h b/lib/search_.h index 7cc249b92..b41abdc4d 100644 --- a/lib/search_.h +++ b/lib/search_.h @@ -20,11 +20,7 @@ /* The include_next requires a split double-inclusion guard. */ #if @HAVE_SEARCH_H@ -# if @HAVE_INCLUDE_NEXT@ -# include_next -# else -# include @ABSOLUTE_SEARCH_H@ -# endif +# @INCLUDE_NEXT@ @NEXT_SEARCH_H@ #endif #ifndef _GL_SEARCH_H diff --git a/lib/signal_.h b/lib/signal_.h index 640e811cf..b62d7a7a3 100644 --- a/lib/signal_.h +++ b/lib/signal_.h @@ -19,11 +19,7 @@ #if defined __need_sig_atomic_t || defined __need_sigset_t /* Special invocation convention inside glibc header files. */ -# if @HAVE_INCLUDE_NEXT@ -# include_next -# else -# include @ABSOLUTE_SIGNAL_H@ -# endif +# @INCLUDE_NEXT@ @NEXT_SIGNAL_H@ #else /* Normal invocation convention. */ @@ -31,11 +27,7 @@ #ifndef _GL_SIGNAL_H /* The include_next requires a split double-inclusion guard. */ -#if @HAVE_INCLUDE_NEXT@ -# include_next -#else -# include @ABSOLUTE_SIGNAL_H@ -#endif +#@INCLUDE_NEXT@ @NEXT_SIGNAL_H@ #ifndef _GL_SIGNAL_H #define _GL_SIGNAL_H diff --git a/lib/stdint_.h b/lib/stdint_.h index d374535c9..3299ac171 100644 --- a/lib/stdint_.h +++ b/lib/stdint_.h @@ -43,14 +43,10 @@ in would reinclude us, skipping our contents because _GL_STDINT_H is defined. The include_next requires a split double-inclusion guard. */ -# if @HAVE_INCLUDE_NEXT@ -# include_next -# else -# include @ABSOLUTE_STDINT_H@ -# endif +# @INCLUDE_NEXT@ @NEXT_STDINT_H@ #endif -#ifndef _GL_STDINT_H +#if ! defined _GL_STDINT_H && ! defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H #define _GL_STDINT_H /* defines some of the stdint.h types as well, on glibc, @@ -58,7 +54,7 @@ AIX 5.2 isn't needed and causes troubles. MacOS X 10.4.6 includes (which is us), but relies on the system definitions, so include - after @ABSOLUTE_STDINT_H@. */ + after @NEXT_STDINT_H@. */ #if @HAVE_SYS_TYPES_H@ && ! defined _AIX # include #endif @@ -509,4 +505,4 @@ #endif /* !defined __cplusplus || defined __STDC_CONSTANT_MACROS */ #endif /* _GL_STDINT_H */ -#endif /* _GL_STDINT_H */ +#endif /* !defined _GL_STDINT_H && !defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H */ diff --git a/lib/stdio_.h b/lib/stdio_.h index 7afaedeed..7d77c5e56 100644 --- a/lib/stdio_.h +++ b/lib/stdio_.h @@ -19,11 +19,7 @@ #if defined __need_FILE || defined __need___FILE /* Special invocation convention inside glibc header files. */ -#if @HAVE_INCLUDE_NEXT@ -# include_next -#else -# include @ABSOLUTE_STDIO_H@ -#endif +#@INCLUDE_NEXT@ @NEXT_STDIO_H@ #else /* Normal invocation convention. */ @@ -31,11 +27,7 @@ #ifndef _GL_STDIO_H /* The include_next requires a split double-inclusion guard. */ -#if @HAVE_INCLUDE_NEXT@ -# include_next -#else -# include @ABSOLUTE_STDIO_H@ -#endif +#@INCLUDE_NEXT@ @NEXT_STDIO_H@ #ifndef _GL_STDIO_H #define _GL_STDIO_H diff --git a/lib/stdlib_.h b/lib/stdlib_.h index 130f071a5..d1e254ab7 100644 --- a/lib/stdlib_.h +++ b/lib/stdlib_.h @@ -19,11 +19,7 @@ #if defined __need_malloc_and_calloc /* Special invocation convention inside glibc header files. */ -#if @HAVE_INCLUDE_NEXT@ -# include_next -#else -# include @ABSOLUTE_STDLIB_H@ -#endif +#@INCLUDE_NEXT@ @NEXT_STDLIB_H@ #else /* Normal invocation convention. */ @@ -31,11 +27,7 @@ #ifndef _GL_STDLIB_H /* The include_next requires a split double-inclusion guard. */ -#if @HAVE_INCLUDE_NEXT@ -# include_next -#else -# include @ABSOLUTE_STDLIB_H@ -#endif +#@INCLUDE_NEXT@ @NEXT_STDLIB_H@ #ifndef _GL_STDLIB_H #define _GL_STDLIB_H diff --git a/lib/string_.h b/lib/string_.h index 4dbe66ccc..bfb22b0eb 100644 --- a/lib/string_.h +++ b/lib/string_.h @@ -19,11 +19,7 @@ #ifndef _GL_STRING_H /* The include_next requires a split double-inclusion guard. */ -#if @HAVE_INCLUDE_NEXT@ -# include_next -#else -# include @ABSOLUTE_STRING_H@ -#endif +#@INCLUDE_NEXT@ @NEXT_STRING_H@ #ifndef _GL_STRING_H #define _GL_STRING_H diff --git a/lib/sys_stat_.h b/lib/sys_stat_.h index 13333d33a..2e411cd3c 100644 --- a/lib/sys_stat_.h +++ b/lib/sys_stat_.h @@ -24,11 +24,7 @@ #ifndef _GL_SYS_STAT_H /* The include_next requires a split double-inclusion guard. */ -#if @HAVE_INCLUDE_NEXT@ -# include_next -#else -# include @ABSOLUTE_SYS_STAT_H@ -#endif +#@INCLUDE_NEXT@ @NEXT_SYS_STAT_H@ #ifndef _GL_SYS_STAT_H #define _GL_SYS_STAT_H diff --git a/lib/sys_time_.h b/lib/sys_time_.h index 253316f7b..08fac3c7e 100644 --- a/lib/sys_time_.h +++ b/lib/sys_time_.h @@ -22,11 +22,7 @@ /* The include_next requires a split double-inclusion guard. */ #if @HAVE_SYS_TIME_H@ -# if @HAVE_INCLUDE_NEXT@ -# include_next -# else -# include @ABSOLUTE_SYS_TIME_H@ -# endif +# @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@ #else # include #endif diff --git a/lib/time_.h b/lib/time_.h index 9a0507e68..efc3d3b8d 100644 --- a/lib/time_.h +++ b/lib/time_.h @@ -21,11 +21,7 @@ symbols. */ #if defined __need_time_t || defined __need_clock_t || defined __need_timespec -# if @HAVE_INCLUDE_NEXT@ -# include_next -# else -# include @ABSOLUTE_TIME_H@ -# endif +# @INCLUDE_NEXT@ @NEXT_TIME_H@ #else /* Normal invocation convention. */ @@ -33,11 +29,7 @@ # if ! defined _GL_TIME_H /* The include_next requires a split double-inclusion guard. */ -# if @HAVE_INCLUDE_NEXT@ -# include_next -# else -# include @ABSOLUTE_TIME_H@ -# endif +# @INCLUDE_NEXT@ @NEXT_TIME_H@ # if ! defined _GL_TIME_H # define _GL_TIME_H diff --git a/lib/unistd_.h b/lib/unistd_.h index 240900531..07c487783 100644 --- a/lib/unistd_.h +++ b/lib/unistd_.h @@ -19,11 +19,7 @@ /* The include_next requires a split double-inclusion guard. */ #if @HAVE_UNISTD_H@ -# if @HAVE_INCLUDE_NEXT@ -# include_next -# else -# include @ABSOLUTE_UNISTD_H@ -# endif +# @INCLUDE_NEXT@ @NEXT_UNISTD_H@ #endif #ifndef _GL_UNISTD_H diff --git a/lib/wchar_.h b/lib/wchar_.h index 6e04ccca7..1d52b1dd1 100644 --- a/lib/wchar_.h +++ b/lib/wchar_.h @@ -39,11 +39,7 @@ Some builds of uClibc lack it. */ /* The include_next requires a split double-inclusion guard. */ #if @HAVE_WCHAR_H@ -# if @HAVE_INCLUDE_NEXT@ -# include_next -# else -# include @ABSOLUTE_WCHAR_H@ -# endif +# @INCLUDE_NEXT@ @NEXT_WCHAR_H@ #endif #ifndef _GL_WCHAR_H diff --git a/lib/wctype_.h b/lib/wctype_.h index ebbfca4b0..73ce09f45 100644 --- a/lib/wctype_.h +++ b/lib/wctype_.h @@ -44,11 +44,7 @@ BeOS 5 has the functions but no . */ /* The include_next requires a split double-inclusion guard. */ #if @HAVE_WCTYPE_H@ -# if @HAVE_INCLUDE_NEXT@ -# include_next -# else -# include @ABSOLUTE_WCTYPE_H@ -# endif +# @INCLUDE_NEXT@ @NEXT_WCTYPE_H@ #endif #ifndef _GL_WCTYPE_H diff --git a/m4/fcntl_h.m4 b/m4/fcntl_h.m4 index 9846b2f31..3ae7efe8e 100644 --- a/m4/fcntl_h.m4 +++ b/m4/fcntl_h.m4 @@ -1,5 +1,5 @@ # Configure fcntl.h. -dnl Copyright (C) 2006 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 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. @@ -73,9 +73,7 @@ AC_DEFUN([gl_FCNTL_H], AC_DEFINE_UNQUOTED([HAVE_WORKING_O_NOFOLLOW], [$ac_val], [Define to 1 if O_NOFOLLOW works.]) - gl_ABSOLUTE_HEADER([fcntl.h]) - ABSOLUTE_FCNTL_H=\"$gl_cv_absolute_fcntl_h\" - AC_SUBST([ABSOLUTE_FCNTL_H]) + gl_CHECK_NEXT_HEADERS([fcntl.h]) FCNTL_H='fcntl.h' AC_SUBST([FCNTL_H]) ]) diff --git a/m4/float_h.m4 b/m4/float_h.m4 index 36a07dcb1..1b1ad103e 100644 --- a/m4/float_h.m4 +++ b/m4/float_h.m4 @@ -1,4 +1,4 @@ -# float_h.m4 serial 1 +# float_h.m4 serial 2 dnl Copyright (C) 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, @@ -12,9 +12,7 @@ AC_DEFUN([gl_FLOAT_H], case "$host_os" in beos*) FLOAT_H=float.h - gl_ABSOLUTE_HEADER([float.h]) - ABSOLUTE_FLOAT_H=\"$gl_cv_absolute_float_h\" - AC_SUBST([ABSOLUTE_FLOAT_H]) + gl_CHECK_NEXT_HEADERS([float.h]) ;; esac AC_SUBST([FLOAT_H]) diff --git a/m4/include_next.m4 b/m4/include_next.m4 index 62c5f3b3b..dfd5ec574 100644 --- a/m4/include_next.m4 +++ b/m4/include_next.m4 @@ -1,19 +1,79 @@ -# include_next.m4 serial 1 -dnl Copyright (C) 2006 Free Software Foundation, Inc. +# include_next.m4 serial 2 +dnl Copyright (C) 2006, 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. -dnl From Derek Price. +dnl From Paul Eggert and Derek Price. AC_DEFUN([gl_INCLUDE_NEXT], -[AC_CACHE_CHECK([whether the preprocessor supports include_next], -[gl_cv_have_include_next], -[AC_PREPROC_IFELSE([#include_next ], - [gl_cv_have_include_next=yes], - [gl_cv_have_include_next=no])]) -if test $gl_cv_have_include_next = yes; then - AC_DEFINE([HAVE_INCLUDE_NEXT], 1, - [Define if your compiler supports the #include_next directive.]) -fi +[ + AC_LANG_PREPROC_REQUIRE() + AC_CACHE_CHECK([whether the preprocessor supports include_next], + [gl_cv_have_include_next], + [AC_PREPROC_IFELSE([#include_next ], + [gl_cv_have_include_next=yes], + [gl_cv_have_include_next=no])]) + if test $gl_cv_have_include_next = yes; then + + dnl FIXME: Remove HAVE_INCLUDE_NEXT and update everything that uses it + dnl to use @INCLUDE_NEXT@ instead. + AC_DEFINE([HAVE_INCLUDE_NEXT], 1, + [Define if your compiler supports the #include_next directive.]) + + INCLUDE_NEXT=include_next + else + INCLUDE_NEXT=include + fi + AC_SUBST([INCLUDE_NEXT]) +]) + +# gl_CHECK_NEXT_HEADERS(HEADER1 HEADER2 ...) +# ------------------------------------------ +# For each arg foo.h, if #include_next works, define NEXT_FOO_H to be +# ''; otherwise define it to be +# '"///usr/include/foo.h"', or whatever other absolute file name is suitable. +# That way, a header file with the following line: +# #@INCLUDE_NEXT@ @NEXT_FOO_H@ +# behaves (after sed substitution) as if it contained +# #include_next +# even if the compiler does not support include_next. +# The three "///" are to pacify Sun C 5.8, which otherwise would say +# "warning: #include of /usr/include/... may be non-portable". +# Use `""', not `<>', so that the /// cannot be confused with a C99 comment. +AC_DEFUN([gl_CHECK_NEXT_HEADERS], +[ + AC_REQUIRE([gl_INCLUDE_NEXT]) + AC_CHECK_HEADERS_ONCE([$1]) + + AC_FOREACH([gl_HEADER_NAME], [$1], + [AS_VAR_PUSHDEF([gl_next_header], + [gl_cv_next_]m4_quote(m4_defn([gl_HEADER_NAME]))) + AS_VAR_SET([gl_next_header], ['<'gl_HEADER_NAME'>']) + if test $gl_cv_have_include_next = no; then + AC_CACHE_CHECK( + [absolute name of <]m4_quote(m4_defn([gl_HEADER_NAME]))[>], + m4_quote(m4_defn([gl_next_header])), + [if test AS_VAR_GET([ac_cv_header_]m4_quote(m4_defn([gl_HEADER_NAME]))) = yes; then + AC_LANG_CONFTEST( + [AC_LANG_SOURCE( + [[#include <]]m4_dquote(m4_defn([gl_HEADER_NAME]))[[>]] + )]) + dnl eval is necessary to expand ac_cpp. + dnl Ultrix and Pyramid sh refuse to redirect output of eval, + dnl so use subshell. + AS_VAR_SET([gl_next_header], + ['"'`(eval "$ac_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD | + sed -n '\#/]m4_quote(m4_defn([gl_HEADER_NAME]))[#{ + s#.*"\(.*/]m4_quote(m4_defn([gl_HEADER_NAME]))[\)".*#\1# + s#^/[^/]#//&# + p + q + }'`'"']) + fi]) + fi + AC_SUBST( + AS_TR_CPP([NEXT_]m4_quote(m4_defn([gl_HEADER_NAME]))), + [AS_VAR_GET([gl_next_header])]) + AS_VAR_POPDEF([gl_next_header])]) ]) diff --git a/m4/inttypes.m4 b/m4/inttypes.m4 index 095ace944..05f2b2db1 100644 --- a/m4/inttypes.m4 +++ b/m4/inttypes.m4 @@ -1,4 +1,4 @@ -# inttypes.m4 serial 8 +# inttypes.m4 serial 9 dnl Copyright (C) 2006-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, @@ -37,7 +37,8 @@ AC_DEFUN([gl_INTTYPES_H], #define __STDC_LIMIT_MACROS 1 /* to make it work also in C++ mode */ #define __STDC_CONSTANT_MACROS 1 /* to make it work also in C++ mode */ #define __STDC_FORMAT_MACROS 1 /* to make it work also in C++ mode */ -#include ABSOLUTE_INTTYPES_H +#define _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H /* work if build isn't clean */ +#include /* No need to duplicate the tests of stdint.m4; they are subsumed by $gl_cv_header_working_stdint_h = yes. */ @@ -141,14 +142,7 @@ const char *l = /* implicit string concatenation */ else AC_REQUIRE([gl_INTTYPES_H_DEFAULTS]) - dnl AC_INCLUDES_DEFAULT defines $ac_cv_header_inttypes_h. - if test $ac_cv_header_inttypes_h = yes; then - gl_ABSOLUTE_HEADER([inttypes.h]) - ABSOLUTE_INTTYPES_H=\"$gl_cv_absolute_inttypes_h\" - else - ABSOLUTE_INTTYPES_H=\"no/such/file/inttypes.h\" - fi - AC_SUBST([ABSOLUTE_INTTYPES_H]) + gl_CHECK_NEXT_HEADERS([inttypes.h]) PRIPTR_PREFIX= if test -n "$STDINT_H"; then diff --git a/m4/math_h.m4 b/m4/math_h.m4 index cc8570248..21f3449c6 100644 --- a/m4/math_h.m4 +++ b/m4/math_h.m4 @@ -1,4 +1,4 @@ -# math_h.m4 serial 4 +# math_h.m4 serial 5 dnl Copyright (C) 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, @@ -7,9 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_MATH_H], [ AC_REQUIRE([gl_MATH_H_DEFAULTS]) - gl_ABSOLUTE_HEADER([math.h]) - ABSOLUTE_MATH_H=\"$gl_cv_absolute_math_h\" - AC_SUBST([ABSOLUTE_MATH_H]) + gl_CHECK_NEXT_HEADERS([math.h]) ]) AC_DEFUN([gl_MATH_MODULE_INDICATOR], diff --git a/m4/search_h.m4 b/m4/search_h.m4 index d894ed023..333d1b24c 100644 --- a/m4/search_h.m4 +++ b/m4/search_h.m4 @@ -1,4 +1,4 @@ -# search_h.m4 serial 1 +# search_h.m4 serial 2 dnl Copyright (C) 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, @@ -7,16 +7,13 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_SEARCH_H], [ AC_REQUIRE([gl_SEARCH_H_DEFAULTS]) - AC_CHECK_HEADERS_ONCE([search.h]) + gl_CHECK_NEXT_HEADERS([search.h]) if test $ac_cv_header_search_h = yes; then HAVE_SEARCH_H=1 - gl_ABSOLUTE_HEADER([search.h]) - ABSOLUTE_SEARCH_H=\"$gl_cv_absolute_search_h\" else HAVE_SEARCH_H=0 fi AC_SUBST([HAVE_SEARCH_H]) - AC_SUBST([ABSOLUTE_SEARCH_H]) ]) AC_DEFUN([gl_SEARCH_MODULE_INDICATOR], diff --git a/m4/signal_h.m4 b/m4/signal_h.m4 index c9b40ca19..37ebca99a 100644 --- a/m4/signal_h.m4 +++ b/m4/signal_h.m4 @@ -1,4 +1,4 @@ -# signal_h.m4 serial 2 +# signal_h.m4 serial 3 dnl Copyright (C) 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, @@ -7,9 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_SIGNAL_H], [ AC_REQUIRE([gl_SIGNAL_H_DEFAULTS]) - gl_ABSOLUTE_HEADER([signal.h]) - ABSOLUTE_SIGNAL_H=\"$gl_cv_absolute_signal_h\" - AC_SUBST([ABSOLUTE_SIGNAL_H]) + gl_CHECK_NEXT_HEADERS([signal.h]) ]) AC_DEFUN([gl_SIGNAL_MODULE_INDICATOR], diff --git a/m4/stdint.m4 b/m4/stdint.m4 index c12311d27..e8016bdd7 100644 --- a/m4/stdint.m4 +++ b/m4/stdint.m4 @@ -1,4 +1,4 @@ -# stdint.m4 serial 26 +# stdint.m4 serial 27 dnl Copyright (C) 2001-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, @@ -45,22 +45,15 @@ AC_DEFUN([gl_STDINT_H], fi AC_SUBST([HAVE_SYS_TYPES_H]) - dnl AC_INCLUDES_DEFAULT defines $ac_cv_header_stdint_h. + gl_CHECK_NEXT_HEADERS([stdint.h]) if test $ac_cv_header_stdint_h = yes; then - gl_ABSOLUTE_HEADER([stdint.h]) - ABSOLUTE_STDINT_H=\"$gl_cv_absolute_stdint_h\" HAVE_STDINT_H=1 else - ABSOLUTE_STDINT_H=\"no/such/file/stdint.h\" HAVE_STDINT_H=0 fi - AC_SUBST([ABSOLUTE_STDINT_H]) AC_SUBST([HAVE_STDINT_H]) - dnl Now see whether we need a substitute . Use - dnl ABSOLUTE_STDINT_H, not , so that it also works during - dnl a "config.status --recheck" if a stdint.h has been - dnl created in the build directory. + dnl Now see whether we need a substitute . if test $ac_cv_header_stdint_h = yes; then AC_CACHE_CHECK([whether stdint.h conforms to C99], [gl_cv_header_working_stdint_h], @@ -70,7 +63,8 @@ AC_DEFUN([gl_STDINT_H], [ #define __STDC_LIMIT_MACROS 1 /* to make it work also in C++ mode */ #define __STDC_CONSTANT_MACROS 1 /* to make it work also in C++ mode */ -#include ABSOLUTE_STDINT_H +#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */ +#include #ifdef INT8_MAX int8_t a1 = INT8_MAX; int8_t a1min = INT8_MIN; diff --git a/m4/stdio_h.m4 b/m4/stdio_h.m4 index 955c91216..721c82629 100644 --- a/m4/stdio_h.m4 +++ b/m4/stdio_h.m4 @@ -1,4 +1,4 @@ -# stdio_h.m4 serial 6 +# stdio_h.m4 serial 7 dnl Copyright (C) 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, @@ -7,9 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_STDIO_H], [ AC_REQUIRE([gl_STDIO_H_DEFAULTS]) - gl_ABSOLUTE_HEADER([stdio.h]) - ABSOLUTE_STDIO_H=\"$gl_cv_absolute_stdio_h\" - AC_SUBST([ABSOLUTE_STDIO_H]) + gl_CHECK_NEXT_HEADERS([stdio.h]) ]) AC_DEFUN([gl_STDIO_MODULE_INDICATOR], diff --git a/m4/stdlib_h.m4 b/m4/stdlib_h.m4 index d46a5f06d..f13b4297a 100644 --- a/m4/stdlib_h.m4 +++ b/m4/stdlib_h.m4 @@ -1,4 +1,4 @@ -# stdlib_h.m4 serial 1 +# stdlib_h.m4 serial 2 dnl Copyright (C) 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, @@ -7,9 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_STDLIB_H], [ AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) - gl_ABSOLUTE_HEADER([stdlib.h]) - ABSOLUTE_STDLIB_H=\"$gl_cv_absolute_stdlib_h\" - AC_SUBST([ABSOLUTE_STDLIB_H]) + gl_CHECK_NEXT_HEADERS([stdlib.h]) ]) AC_DEFUN([gl_STDLIB_MODULE_INDICATOR], diff --git a/m4/string_h.m4 b/m4/string_h.m4 index ab5d78698..ec51e9a01 100644 --- a/m4/string_h.m4 +++ b/m4/string_h.m4 @@ -18,9 +18,7 @@ AC_DEFUN([gl_HEADER_STRING_H_BODY], [ AC_REQUIRE([AC_C_RESTRICT]) AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) - gl_ABSOLUTE_HEADER([string.h]) - ABSOLUTE_STRING_H=\"$gl_cv_absolute_string_h\" - AC_SUBST([ABSOLUTE_STRING_H]) + gl_CHECK_NEXT_HEADERS([string.h]) ]) AC_DEFUN([gl_STRING_MODULE_INDICATOR], diff --git a/m4/sys_stat_h.m4 b/m4/sys_stat_h.m4 index 228313855..1bc08a172 100644 --- a/m4/sys_stat_h.m4 +++ b/m4/sys_stat_h.m4 @@ -1,4 +1,4 @@ -# sys_stat_h.m4 serial 5 -*- Autoconf -*- +# sys_stat_h.m4 serial 6 -*- Autoconf -*- dnl Copyright (C) 2006-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, @@ -42,9 +42,7 @@ AC_DEFUN([gl_HEADER_SYS_STAT_H], dnl Check for broken stat macros. AC_REQUIRE([AC_HEADER_STAT]) - gl_ABSOLUTE_HEADER([sys/stat.h]) - ABSOLUTE_SYS_STAT_H=\"$gl_cv_absolute_sys_stat_h\" - AC_SUBST([ABSOLUTE_SYS_STAT_H]) + gl_CHECK_NEXT_HEADERS([sys/stat.h]) SYS_STAT_H='sys/stat.h' AC_SUBST([SYS_STAT_H]) ]) # gl_HEADER_SYS_STAT_H diff --git a/m4/sys_time_h.m4 b/m4/sys_time_h.m4 index b38e1bc5f..13ac5763b 100644 --- a/m4/sys_time_h.m4 +++ b/m4/sys_time_h.m4 @@ -18,17 +18,13 @@ AC_DEFUN([gl_HEADER_SYS_TIME_H], AC_DEFUN([gl_HEADER_SYS_TIME_H_BODY], [ AC_REQUIRE([AC_C_RESTRICT]) - AC_CHECK_HEADERS_ONCE([sys/time.h]) + gl_CHECK_NEXT_HEADERS([sys/time.h]) if test $ac_cv_header_sys_time_h = yes; then - gl_ABSOLUTE_HEADER([sys/time.h]) - ABSOLUTE_SYS_TIME_H=\"$gl_cv_absolute_sys_time_h\" HAVE_SYS_TIME_H=1 else - ABSOLUTE_SYS_TIME_H=\"no/such/file/sys/time.h\" HAVE_SYS_TIME_H=0 fi - AC_SUBST([ABSOLUTE_SYS_TIME_H]) AC_SUBST([HAVE_SYS_TIME_H]) AC_CACHE_CHECK([for struct timeval], [gl_cv_sys_struct_timeval], diff --git a/m4/time_h.m4 b/m4/time_h.m4 index e90ed7ac3..3f543a15a 100644 --- a/m4/time_h.m4 +++ b/m4/time_h.m4 @@ -20,9 +20,7 @@ AC_DEFUN([gl_HEADER_TIME_H_BODY], [ AC_REQUIRE([AC_C_RESTRICT]) AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) - gl_ABSOLUTE_HEADER([time.h]) - ABSOLUTE_TIME_H=\"$gl_cv_absolute_time_h\" - AC_SUBST([ABSOLUTE_TIME_H]) + gl_CHECK_NEXT_HEADERS([time.h]) AC_REQUIRE([gl_CHECK_TYPE_STRUCT_TIMESPEC]) ]) diff --git a/m4/unistd_h.m4 b/m4/unistd_h.m4 index 90e1eaa32..b12f84e8e 100644 --- a/m4/unistd_h.m4 +++ b/m4/unistd_h.m4 @@ -1,4 +1,4 @@ -# unistd_h.m4 serial 8 +# unistd_h.m4 serial 9 dnl Copyright (C) 2006-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, @@ -12,16 +12,15 @@ AC_DEFUN([gl_UNISTD_H], dnl once only, before all statements that occur in other macros. AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) + gl_CHECK_NEXT_HEADERS([unistd.h]) + AC_CHECK_HEADERS_ONCE([unistd.h]) if test $ac_cv_header_unistd_h = yes; then HAVE_UNISTD_H=1 - gl_ABSOLUTE_HEADER([unistd.h]) - ABSOLUTE_UNISTD_H=\"$gl_cv_absolute_unistd_h\" else HAVE_UNISTD_H=0 fi AC_SUBST([HAVE_UNISTD_H]) - AC_SUBST([ABSOLUTE_UNISTD_H]) ]) AC_DEFUN([gl_UNISTD_MODULE_INDICATOR], diff --git a/m4/wchar.m4 b/m4/wchar.m4 index 30377ca12..bf32d2831 100644 --- a/m4/wchar.m4 +++ b/m4/wchar.m4 @@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. dnl Written by Eric Blake. -# wchar.m4 serial 2 +# wchar.m4 serial 3 AC_DEFUN([gl_WCHAR_H], [ @@ -29,10 +29,8 @@ wchar_t w;]], HAVE_WCHAR_H=0 fi AC_SUBST([HAVE_WCHAR_H]) - gl_ABSOLUTE_HEADER([wchar.h]) - ABSOLUTE_WCHAR_H=\"$gl_cv_absolute_wchar_h\" + gl_CHECK_NEXT_HEADERS([wchar.h]) WCHAR_H=wchar.h fi - AC_SUBST([ABSOLUTE_WCHAR_H]) AC_SUBST([WCHAR_H]) ]) diff --git a/m4/wctype.m4 b/m4/wctype.m4 index a56834d0c..7483c4fea 100644 --- a/m4/wctype.m4 +++ b/m4/wctype.m4 @@ -32,16 +32,13 @@ AC_DEFUN([gl_WCTYPE_H], if test $ac_cv_func_iswcntrl = yes; then WCTYPE_H= fi - dnl Compute ABSOLUTE_WCTYPE_H even if WCTYPE_H is empty, + dnl Compute NEXT_WCTYPE_H even if WCTYPE_H is empty, dnl for the benefit of builds from non-distclean directories. - gl_ABSOLUTE_HEADER([wctype.h]) - ABSOLUTE_WCTYPE_H=\"$gl_cv_absolute_wctype_h\" + gl_CHECK_NEXT_HEADERS([wctype.h]) HAVE_WCTYPE_H=1 else - ABSOLUTE_WCTYPE_H=\"no/such/file/wctype.h\" HAVE_WCTYPE_H=0 fi - AC_SUBST([ABSOLUTE_WCTYPE_H]) AC_SUBST([HAVE_WCTYPE_H]) AC_SUBST([WCTYPE_H]) ]) diff --git a/modules/fcntl b/modules/fcntl index d8b04bc3b..68fe6ffa6 100644 --- a/modules/fcntl +++ b/modules/fcntl @@ -6,7 +6,7 @@ lib/fcntl_.h m4/fcntl_h.m4 Depends-on: -absolute-header +include_next unistd configure.ac: @@ -20,8 +20,8 @@ BUILT_SOURCES += $(FCNTL_H) fcntl.h: fcntl_.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's|@''ABSOLUTE_FCNTL_H''@|$(ABSOLUTE_FCNTL_H)|g' \ - -e 's/@''HAVE_INCLUDE_NEXT''@/$(HAVE_INCLUDE_NEXT)/g' \ + sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + -e 's|@''NEXT_FCNTL_H''@|$(NEXT_FCNTL_H)|g' \ < $(srcdir)/fcntl_.h; \ } > $@-t mv $@-t $@ diff --git a/modules/float b/modules/float index 9dce2b4d6..c565f7f8b 100644 --- a/modules/float +++ b/modules/float @@ -6,7 +6,7 @@ lib/float_.h m4/float_h.m4 Depends-on: -absolute-header +include_next configure.ac: gl_FLOAT_H @@ -19,8 +19,8 @@ BUILT_SOURCES += $(FLOAT_H) float.h: float_.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ - sed -e 's|@''ABSOLUTE_FLOAT_H''@|$(ABSOLUTE_FLOAT_H)|g' \ - -e 's/@''HAVE_INCLUDE_NEXT''@/$(HAVE_INCLUDE_NEXT)/g' \ + sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + -e 's|@''NEXT_FLOAT_H''@|$(NEXT_FLOAT_H)|g' \ < $(srcdir)/float_.h; \ } > $@-t mv $@-t $@ diff --git a/modules/inttypes b/modules/inttypes index 59dd09ab4..1df7b292f 100644 --- a/modules/inttypes +++ b/modules/inttypes @@ -7,7 +7,7 @@ m4/inttypes-pri.m4 m4/inttypes.m4 Depends-on: -absolute-header +include_next link-warning stdint @@ -23,8 +23,8 @@ inttypes.h: inttypes_.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \ - -e 's|@''ABSOLUTE_INTTYPES_H''@|$(ABSOLUTE_INTTYPES_H)|g' \ - -e 's/@''HAVE_INCLUDE_NEXT''@/$(HAVE_INCLUDE_NEXT)/g' \ + -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + -e 's|@''NEXT_INTTYPES_H''@|$(NEXT_INTTYPES_H)|g' \ -e 's/@''PRI_MACROS_BROKEN''@/$(PRI_MACROS_BROKEN)/g' \ -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \ -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \ diff --git a/modules/math b/modules/math index 85832a3e2..9430b9af3 100644 --- a/modules/math +++ b/modules/math @@ -6,7 +6,7 @@ lib/math_.h m4/math_h.m4 Depends-on: -absolute-header +include_next link-warning configure.ac: @@ -20,8 +20,8 @@ BUILT_SOURCES += math.h math.h: math_.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ - sed -e 's|@''ABSOLUTE_MATH_H''@|$(ABSOLUTE_MATH_H)|g' \ - -e 's/@''HAVE_INCLUDE_NEXT''@/$(HAVE_INCLUDE_NEXT)/g' \ + sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + -e 's|@''NEXT_MATH_H''@|$(NEXT_MATH_H)|g' \ -e 's|@''GNULIB_FREXP''@|$(GNULIB_FREXP)|g' \ -e 's|@''GNULIB_FREXPL''@|$(GNULIB_FREXPL)|g' \ -e 's|@''GNULIB_LDEXPL''@|$(GNULIB_LDEXPL)|g' \ diff --git a/modules/search b/modules/search index 0ed8b8da4..9ab82eaec 100644 --- a/modules/search +++ b/modules/search @@ -6,7 +6,7 @@ lib/search_.h m4/search_h.m4 Depends-on: -absolute-header +include_next link-warning configure.ac: @@ -21,8 +21,8 @@ search.h: search_.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ sed -e 's|@''HAVE_SEARCH_H''@|$(HAVE_SEARCH_H)|g' \ - -e 's/@''HAVE_INCLUDE_NEXT''@/$(HAVE_INCLUDE_NEXT)/g' \ - -e 's|@''ABSOLUTE_SEARCH_H''@|$(ABSOLUTE_SEARCH_H)|g' \ + -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + -e 's|@''NEXT_SEARCH_H''@|$(NEXT_SEARCH_H)|g' \ -e 's|@''GNULIB_TSEARCH''@|$(GNULIB_TSEARCH)|g' \ -e 's|@''HAVE_TSEARCH''@|$(HAVE_TSEARCH)|g' \ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ diff --git a/modules/signal b/modules/signal index 26a39b947..66a48c648 100644 --- a/modules/signal +++ b/modules/signal @@ -6,7 +6,7 @@ lib/signal_.h m4/signal_h.m4 Depends-on: -absolute-header +include_next link-warning configure.ac: @@ -20,8 +20,8 @@ BUILT_SOURCES += signal.h signal.h: signal_.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ - sed -e 's|@''ABSOLUTE_SIGNAL_H''@|$(ABSOLUTE_SIGNAL_H)|g' \ - -e 's/@''HAVE_INCLUDE_NEXT''@/$(HAVE_INCLUDE_NEXT)/g' \ + sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + -e 's|@''NEXT_SIGNAL_H''@|$(NEXT_SIGNAL_H)|g' \ -e 's|@''GNULIB_SIGPROCMASK''@|$(GNULIB_SIGPROCMASK)|g' \ -e 's|@''HAVE_POSIX_SIGNALBLOCKING''@|$(HAVE_POSIX_SIGNALBLOCKING)|g' \ -e 's|@''HAVE_SIGSET_T''@|$(HAVE_SIGSET_T)|g' \ diff --git a/modules/stdint b/modules/stdint index 112540207..defd05508 100644 --- a/modules/stdint +++ b/modules/stdint @@ -13,7 +13,7 @@ m4/longlong.m4 m4/ulonglong.m4 Depends-on: -absolute-header +include_next wchar configure.ac: @@ -28,8 +28,8 @@ stdint.h: stdint_.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \ - -e 's|@''ABSOLUTE_STDINT_H''@|$(ABSOLUTE_STDINT_H)|g' \ - -e 's/@''HAVE_INCLUDE_NEXT''@/$(HAVE_INCLUDE_NEXT)/g' \ + -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + -e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \ -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \ -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \ -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \ diff --git a/modules/stdio b/modules/stdio index 18c80b445..c277ecaa7 100644 --- a/modules/stdio +++ b/modules/stdio @@ -6,7 +6,7 @@ lib/stdio_.h m4/stdio_h.m4 Depends-on: -absolute-header +include_next link-warning configure.ac: @@ -20,8 +20,8 @@ BUILT_SOURCES += stdio.h stdio.h: stdio_.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ - sed -e 's|@''ABSOLUTE_STDIO_H''@|$(ABSOLUTE_STDIO_H)|g' \ - -e 's/@''HAVE_INCLUDE_NEXT''@/$(HAVE_INCLUDE_NEXT)/g' \ + sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + -e 's|@''NEXT_STDIO_H''@|$(NEXT_STDIO_H)|g' \ -e 's|@''GNULIB_FPRINTF_POSIX''@|$(GNULIB_FPRINTF_POSIX)|g' \ -e 's|@''GNULIB_PRINTF_POSIX''@|$(GNULIB_PRINTF_POSIX)|g' \ -e 's|@''GNULIB_SNPRINTF''@|$(GNULIB_SNPRINTF)|g' \ diff --git a/modules/stdlib b/modules/stdlib index 5254e86e3..2d4ce38d6 100644 --- a/modules/stdlib +++ b/modules/stdlib @@ -21,8 +21,8 @@ BUILT_SOURCES += stdlib.h stdlib.h: stdlib_.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ - sed -e 's|@''ABSOLUTE_STDLIB_H''@|$(ABSOLUTE_STDLIB_H)|g' \ - -e 's/@''HAVE_INCLUDE_NEXT''@/$(HAVE_INCLUDE_NEXT)/g' \ + sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + -e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \ -e 's|@''GNULIB_GETSUBOPT''@|$(GNULIB_GETSUBOPT)|g' \ -e 's|@''GNULIB_MKDTEMP''@|$(GNULIB_MKDTEMP)|g' \ -e 's|@''GNULIB_MKSTEMP''@|$(GNULIB_MKSTEMP)|g' \ diff --git a/modules/string b/modules/string index b0f715095..07b767297 100644 --- a/modules/string +++ b/modules/string @@ -6,8 +6,8 @@ lib/string_.h m4/string_h.m4 Depends-on: -absolute-header extensions +include_next link-warning configure.ac: @@ -21,8 +21,8 @@ BUILT_SOURCES += string.h string.h: string_.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ - sed -e 's|@''ABSOLUTE_STRING_H''@|$(ABSOLUTE_STRING_H)|g' \ - -e 's/@''HAVE_INCLUDE_NEXT''@/$(HAVE_INCLUDE_NEXT)/g' \ + sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + -e 's|@''NEXT_STRING_H''@|$(NEXT_STRING_H)|g' \ -e 's|@''GNULIB_MBSLEN''@|$(GNULIB_MBSLEN)|g' \ -e 's|@''GNULIB_MBSNLEN''@|$(GNULIB_MBSNLEN)|g' \ -e 's|@''GNULIB_MBSCHR''@|$(GNULIB_MBSCHR)|g' \ diff --git a/modules/sys_stat b/modules/sys_stat index 4a981ce48..3ebdc98a9 100644 --- a/modules/sys_stat +++ b/modules/sys_stat @@ -6,7 +6,7 @@ lib/sys_stat_.h m4/sys_stat_h.m4 Depends-on: -absolute-header +include_next configure.ac: gl_HEADER_SYS_STAT_H @@ -21,8 +21,8 @@ sys/stat.h: sys_stat_.h @MKDIR_P@ sys rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's|@''ABSOLUTE_SYS_STAT_H''@|$(ABSOLUTE_SYS_STAT_H)|g' \ - -e 's/@''HAVE_INCLUDE_NEXT''@/$(HAVE_INCLUDE_NEXT)/g' \ + sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + -e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \ -e 's|@''HAVE_IO_H''@|$(HAVE_IO_H)|g' \ -e 's|@''HAVE_LSTAT''@|$(HAVE_LSTAT)|g' \ -e 's|@''HAVE_DECL_MKDIR''@|$(HAVE_DECL_MKDIR)|g' \ @@ -39,4 +39,4 @@ License: LGPL Maintainer: -Eric Blake +all diff --git a/modules/sys_time b/modules/sys_time index 6a66e76b7..8505fd339 100644 --- a/modules/sys_time +++ b/modules/sys_time @@ -6,7 +6,7 @@ lib/sys_time_.h m4/sys_time_h.m4 Depends-on: -absolute-header +include_next configure.ac: gl_HEADER_SYS_TIME_H @@ -22,8 +22,8 @@ sys/time.h: sys_time_.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's/@''HAVE_SYS_TIME_H''@/$(HAVE_SYS_TIME_H)/g' \ - -e 's|@''ABSOLUTE_SYS_TIME_H''@|$(ABSOLUTE_SYS_TIME_H)|g' \ - -e 's/@''HAVE_INCLUDE_NEXT''@/$(HAVE_INCLUDE_NEXT)/g' \ + -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + -e 's|@''NEXT_SYS_TIME_H''@|$(NEXT_SYS_TIME_H)|g' \ -e 's/@''REPLACE_GETTIMEOFDAY''@/$(REPLACE_GETTIMEOFDAY)/g' \ -e 's/@''HAVE_STRUCT_TIMEVAL''@/$(HAVE_STRUCT_TIMEVAL)/g' \ < $(srcdir)/sys_time_.h; \ diff --git a/modules/time b/modules/time index b41280088..24c6c87bf 100644 --- a/modules/time +++ b/modules/time @@ -6,8 +6,8 @@ lib/time_.h m4/time_h.m4 Depends-on: -absolute-header extensions +include_next configure.ac: gl_HEADER_TIME_H @@ -20,8 +20,8 @@ BUILT_SOURCES += time.h time.h: time_.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ - sed -e 's|@ABSOLUTE_TIME_H''@|$(ABSOLUTE_TIME_H)|g' \ - -e 's/@''HAVE_INCLUDE_NEXT''@/$(HAVE_INCLUDE_NEXT)/g' \ + sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + -e 's|@NEXT_TIME_H''@|$(NEXT_TIME_H)|g' \ -e 's|@REPLACE_LOCALTIME_R''@|$(REPLACE_LOCALTIME_R)|g' \ -e 's|@REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \ -e 's|@REPLACE_STRPTIME''@|$(REPLACE_STRPTIME)|g' \ diff --git a/modules/unistd b/modules/unistd index 3529b03c5..ed5f8b7d0 100644 --- a/modules/unistd +++ b/modules/unistd @@ -6,7 +6,7 @@ m4/unistd_h.m4 lib/unistd_.h Depends-on: -absolute-header +include_next link-warning configure.ac: @@ -21,8 +21,8 @@ unistd.h: unistd_.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \ - -e 's|@''ABSOLUTE_UNISTD_H''@|$(ABSOLUTE_UNISTD_H)|g' \ - -e 's/@''HAVE_INCLUDE_NEXT''@/$(HAVE_INCLUDE_NEXT)/g' \ + -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \ -e 's|@''GNULIB_CHOWN''@|$(GNULIB_CHOWN)|g' \ -e 's|@''GNULIB_DUP2''@|$(GNULIB_DUP2)|g' \ -e 's|@''GNULIB_FCHDIR''@|$(GNULIB_FCHDIR)|g' \ @@ -55,4 +55,4 @@ License: LGPL Maintainer: -Simon Josefsson +all diff --git a/modules/wchar b/modules/wchar index 93ebd4f7e..7cb8db392 100644 --- a/modules/wchar +++ b/modules/wchar @@ -6,7 +6,7 @@ lib/wchar_.h m4/wchar.m4 Depends-on: -absolute-header +include_next configure.ac: gl_WCHAR_H @@ -19,8 +19,8 @@ BUILT_SOURCES += $(WCHAR_H) wchar.h: wchar_.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's|@''ABSOLUTE_WCHAR_H''@|$(ABSOLUTE_WCHAR_H)|g' \ - -e 's/@''HAVE_INCLUDE_NEXT''@/$(HAVE_INCLUDE_NEXT)/g' \ + sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \ -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \ < $(srcdir)/wchar_.h; \ } > $@-t diff --git a/modules/wctype b/modules/wctype index 8bfbb066c..b47a3913b 100644 --- a/modules/wctype +++ b/modules/wctype @@ -7,7 +7,7 @@ m4/wctype.m4 m4/wint_t.m4 Depends-on: -absolute-header +include_next configure.ac: gl_WCTYPE_H @@ -21,8 +21,8 @@ wctype.h: wctype_.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \ - -e 's|@''ABSOLUTE_WCTYPE_H''@|$(ABSOLUTE_WCTYPE_H)|g' \ - -e 's/@''HAVE_INCLUDE_NEXT''@/$(HAVE_INCLUDE_NEXT)/g' \ + -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \ -e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \ -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \ < $(srcdir)/wctype_.h; \ -- 2.11.0