problems with GCC 4.2.0 and coreutils with gnulib and system headers

[Paul Eggert]

Building coreutils with GCC 4.2.0 (under Debian stable) yields lots of
problems.  For example:

   gcc -std=gnu99  -I.      -g -O2 -MT savewd.o -MD -MP -MF .deps/savewd.Tpo -c 
-o savewd.o savewd.c
   In file included from ./sys/stat.h:27,
                    from ./fcntl.h:26,
                    from savewd.c:27:
   ///usr/include/sys/stat.h:365: warning: C99 inline functions are not 
supported; using GNU89
   ///usr/include/sys/stat.h:365: warning: to disable this warning use 
-fgnu89-inline or the gnu_inline function attribute

and there are lots more diagnostics like that.  The simplest fix I can
see is for gnulib foo.h to use "#include_next <foo.h>" when
#include_next is known to work.  This is what #include_next is for,
after all.

I installed the following patch to fix the problem for the modules I
help maintain, and will shortly email a followup patch for the
remaining modules.

2007-05-16  Paul Eggert  <address@hidden>

        * lib/fcntl_.h: Prefer #include_next <foo.h> to #include
        @ABSOLUTE_FOO_H@ if @address@hidden  This works better with
        GCC 4.2, which otherwise issues a lot of warnings.
        * lib/inttypes_.h, lib/math_.h, lib/search_.h, lib/signal_.h:
        * lib/stdint_.h, lib/stdio_.h, lib/stdlib_.h, lib/string_.h:
        * lib/sys_time_.h, lib/time_.h, lib/wchar_.h, lib/wctype_.h: Likewise.
        * lib/stdlib_.h: Don't bother with #pragma GCC system_header, as
        it should no longer be needed.
        * lib/string_.h: Likewise.
        * modules/absolute-header (HAVE_INCLUDE_NEXT): New 'make' define.
        * modules/fcntl (fcntl.h): Substitute @address@hidden
        * modules/inttypes (inttypes.h): Likewise.
        * modules/math (math.h): Likewise.
        * modules/search (search.h): Likewise.
        * modules/signal (signal.h): Likewise.
        * modules/stdint (stdint.h): Likewise.
        * modules/stdio (stdio.h): Likewise.
        * modules/stdlib (stdlib.h): Likewise.
        * modules/string (string.h): Likewise.
        * modules/sys_time (sys/time.h): Likewise.
        * modules/time (time.h): Likewise.
        * modules/wchar (wchar.h): Likewise.
        * modules/wctype (wtype.h): Likewise.

Index: lib/fcntl_.h
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/fcntl_.h,v
retrieving revision 1.3
diff -u -p -r1.3 fcntl_.h
--- lib/fcntl_.h        14 Jan 2007 11:32:10 -0000      1.3
+++ lib/fcntl_.h        17 May 2007 06:14:24 -0000
@@ -24,7 +24,11 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include @ABSOLUTE_FCNTL_H@
+#if @HAVE_INCLUDE_NEXT@
+# include_next <fcntl.h>
+#else
+# include @ABSOLUTE_FCNTL_H@
+#endif


 /* Declare overridden functions.  */
Index: lib/inttypes_.h
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/inttypes_.h,v
retrieving revision 1.10
diff -u -p -r1.10 inttypes_.h
--- lib/inttypes_.h     27 Apr 2007 11:09:11 -0000      1.10
+++ lib/inttypes_.h     17 May 2007 06:14:24 -0000
@@ -21,7 +21,7 @@
    which in turn includes this file.  */
 #if ! defined INTTYPES_H || defined _GL_JUST_INCLUDE_ABSOLUTE_INTTYPES_H
 # if @HAVE_INTTYPES_H@
-#  if defined __DECC && __DECC_VER >= 60000000
+#  if @HAVE_INCLUDE_NEXT@
 #   include_next <inttypes.h>
 #  else
 #   include @ABSOLUTE_INTTYPES_H@
Index: lib/math_.h
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/math_.h,v
retrieving revision 1.11
diff -u -p -r1.11 math_.h
--- lib/math_.h 27 Apr 2007 11:09:11 -0000      1.11
+++ lib/math_.h 17 May 2007 06:14:24 -0000
@@ -16,14 +16,14 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */

-#if defined __DECC && __DECC_VER >= 60000000
+#if @HAVE_INCLUDE_NEXT@
 # include_next <math.h>
 #endif

 #ifndef _GL_MATH_H
 #define _GL_MATH_H

-#if !(defined __DECC && __DECC_VER >= 60000000)
+#if ! @HAVE_INCLUDE_NEXT@
 # include @ABSOLUTE_MATH_H@
 #endif

Index: lib/search_.h
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/search_.h,v
retrieving revision 1.1
diff -u -p -r1.1 search_.h
--- lib/search_.h       25 Mar 2007 02:45:24 -0000      1.1
+++ lib/search_.h       17 May 2007 06:14:24 -0000
@@ -20,7 +20,11 @@
 #define _GL_SEARCH_H

 #if @HAVE_SEARCH_H@
-# include @ABSOLUTE_SEARCH_H@
+# if @HAVE_INCLUDE_NEXT@
+#  include_next <search.h>
+# else
+#  include @ABSOLUTE_SEARCH_H@
+# endif
 #endif


@@ -40,9 +44,9 @@ extern "C" {
    for details.  */

 typedef enum
-{ 
+{
   preorder,
-  postorder, 
+  postorder,
   endorder,
   leaf
 }
Index: lib/signal_.h
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/signal_.h,v
retrieving revision 1.2
diff -u -p -r1.2 signal_.h
--- lib/signal_.h       1 May 2007 19:20:18 -0000       1.2
+++ lib/signal_.h       17 May 2007 06:14:24 -0000
@@ -19,7 +19,11 @@
 #if defined __need_sig_atomic_t || defined __need_sigset_t
 /* Special invocation convention inside glibc header files.  */

-#include @ABSOLUTE_SIGNAL_H@
+# if @HAVE_INCLUDE_NEXT@
+#  include_next <signal.h>
+# else
+#  include @ABSOLUTE_SIGNAL_H@
+# endif

 #else
 /* Normal invocation convention.  */
@@ -27,8 +31,11 @@
 #ifndef _GL_SIGNAL_H
 #define _GL_SIGNAL_H

-#include @ABSOLUTE_SIGNAL_H@
-
+#if @HAVE_INCLUDE_NEXT@
+# include_next <signal.h>
+#else
+# include @ABSOLUTE_SIGNAL_H@
+#endif

 /* The definition of GL_LINK_WARNING is copied here.  */

Index: lib/stdint_.h
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/stdint_.h,v
retrieving revision 1.40
diff -u -p -r1.40 stdint_.h
--- lib/stdint_.h       15 Mar 2007 22:58:36 -0000      1.40
+++ lib/stdint_.h       17 May 2007 06:14:24 -0000
@@ -43,7 +43,11 @@
      Include it before <inttypes.h>, since any "#include <stdint.h>"
      in <inttypes.h> would reinclude us, skipping our contents because
      _GL_STDINT_H is defined.  */
-# include @ABSOLUTE_STDINT_H@
+# if @HAVE_INCLUDE_NEXT@
+#  include_next <stdint.h>
+# else
+#  include @ABSOLUTE_STDINT_H@
+# endif
 #endif

 /* <sys/types.h> defines some of the stdint.h types as well, on glibc,
Index: lib/stdio_.h
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/stdio_.h,v
retrieving revision 1.23
diff -u -p -r1.23 stdio_.h
--- lib/stdio_.h        28 Apr 2007 23:02:00 -0000      1.23
+++ lib/stdio_.h        17 May 2007 06:14:24 -0000
@@ -19,19 +19,23 @@
 #if defined __need_FILE || defined __need___FILE
 /* Special invocation convention inside glibc header files.  */

-#include @ABSOLUTE_STDIO_H@
+#if @HAVE_INCLUDE_NEXT@
+# include_next <stdio.h>
+#else
+# include @ABSOLUTE_STDIO_H@
+#endif

 #else
 /* Normal invocation convention.  */

-#if defined __DECC && __DECC_VER >= 60000000
+#if @HAVE_INCLUDE_NEXT@
 # include_next <stdio.h>
 #endif

 #ifndef _GL_STDIO_H
 #define _GL_STDIO_H

-#if !(defined __DECC && __DECC_VER >= 60000000)
+#if ! @HAVE_INCLUDE_NEXT@
 # include @ABSOLUTE_STDIO_H@
 #endif

Index: lib/stdlib_.h
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/stdlib_.h,v
retrieving revision 1.10
diff -u -p -r1.10 stdlib_.h
--- lib/stdlib_.h       13 May 2007 21:44:46 -0000      1.10
+++ lib/stdlib_.h       17 May 2007 06:14:24 -0000
@@ -19,33 +19,23 @@
 #if defined __need_malloc_and_calloc
 /* Special invocation convention inside glibc header files.  */

-/* This #pragma avoids a warning with "gcc -Wall" on some glibc systems
-   on which <stdlib.h> has an inappropriate declaration, see
-   <http://sourceware.org/bugzilla/show_bug.cgi?id=1079>.  */
-#ifdef __GNUC__
-# pragma GCC system_header
+#if @HAVE_INCLUDE_NEXT@
+# include_next <stdlib.h>
+#else
+# include @ABSOLUTE_STDLIB_H@
 #endif

-#include @ABSOLUTE_STDLIB_H@
-
 #else
 /* Normal invocation convention.  */

-#if defined __DECC && __DECC_VER >= 60000000
+#if @HAVE_INCLUDE_NEXT@
 # include_next <stdlib.h>
 #endif

 #ifndef _GL_STDLIB_H
 #define _GL_STDLIB_H

-/* This #pragma avoids a warning with "gcc -Wall" on some glibc systems
-   on which <stdlib.h> has an inappropriate declaration, see
-   <http://sourceware.org/bugzilla/show_bug.cgi?id=1079>.  */
-#ifdef __GNUC__
-# pragma GCC system_header
-#endif
-
-#if !(defined __DECC && __DECC_VER >= 60000000)
+#if ! @HAVE_INCLUDE_NEXT@
 # include @ABSOLUTE_STDLIB_H@
 #endif

Index: lib/string_.h
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/string_.h,v
retrieving revision 1.31
diff -u -p -r1.31 string_.h
--- lib/string_.h       27 Apr 2007 11:09:11 -0000      1.31
+++ lib/string_.h       17 May 2007 06:14:24 -0000
@@ -16,20 +16,14 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */

-#if defined __DECC && __DECC_VER >= 60000000
+#if @HAVE_INCLUDE_NEXT@
 # include_next <string.h>
 #endif

 #ifndef _GL_STRING_H
 #define _GL_STRING_H

-/* This #pragma avoids a warning with "gcc -Wmissing-prototypes" on some
-   mingw systems.  */
-#ifdef __GNUC__
-# pragma GCC system_header
-#endif
-
-#if !(defined __DECC && __DECC_VER >= 60000000)
+#if ! @HAVE_INCLUDE_NEXT@
 # include @ABSOLUTE_STRING_H@
 #endif

Index: lib/sys_time_.h
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/sys_time_.h,v
retrieving revision 1.4
diff -u -p -r1.4 sys_time_.h
--- lib/sys_time_.h     30 Mar 2007 23:56:06 -0000      1.4
+++ lib/sys_time_.h     17 May 2007 06:14:24 -0000
@@ -22,7 +22,11 @@
 #define _GL_SYS_TIME_H

 #if @HAVE_SYS_TIME_H@
-# include @ABSOLUTE_SYS_TIME_H@
+# if @HAVE_INCLUDE_NEXT@
+#  include_next <sys/time.h>
+# else
+#  include @ABSOLUTE_SYS_TIME_H@
+# endif
 #else
 # include <time.h>
 #endif
Index: lib/time_.h
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/time_.h,v
retrieving revision 1.4
diff -u -p -r1.4 time_.h
--- lib/time_.h 27 Apr 2007 11:09:11 -0000      1.4
+++ lib/time_.h 17 May 2007 06:14:24 -0000
@@ -20,19 +20,24 @@
    declare a few standard symbols, rather than to declare all the
    symbols.  */
 #if defined __need_time_t || defined __need_clock_t || defined __need_timespec
-# include @ABSOLUTE_TIME_H@
+
+# if @HAVE_INCLUDE_NEXT@
+#  include_next <time.h>
+# else
+#  include @ABSOLUTE_TIME_H@
+# endif

 #else
 /* Normal invocation convention.  */

-# if defined __DECC && __DECC_VER >= 60000000
+# if @HAVE_INCLUDE_NEXT@
 #  include_next <time.h>
 # endif

 # if ! defined _GL_TIME_H
 #  define _GL_TIME_H

-#  if !(defined __DECC && __DECC_VER >= 60000000)
+#  if ! @HAVE_INCLUDE_NEXT@
 #   include @ABSOLUTE_TIME_H@
 #  endif

Index: lib/wchar_.h
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/wchar_.h,v
retrieving revision 1.3
diff -u -p -r1.3 wchar_.h
--- lib/wchar_.h        27 Apr 2007 11:09:11 -0000      1.3
+++ lib/wchar_.h        17 May 2007 06:14:24 -0000
@@ -25,7 +25,7 @@
  * For now, this just ensures proper prerequisite inclusion order.
  */

-#if defined __DECC && __DECC_VER >= 60000000
+#if @HAVE_INCLUDE_NEXT@
 # include <stdio.h>
 # include_next <wchar.h>
 #endif
@@ -42,7 +42,7 @@
 #include <time.h>

 /* Include the original <wchar.h>.  */
-#if !(defined __DECC && __DECC_VER >= 60000000)
+#if ! @HAVE_INCLUDE_NEXT@
 # include @ABSOLUTE_WCHAR_H@
 #endif

Index: lib/wctype_.h
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/wctype_.h,v
retrieving revision 1.11
diff -u -p -r1.11 wctype_.h
--- lib/wctype_.h       1 May 2007 18:21:31 -0000       1.11
+++ lib/wctype_.h       17 May 2007 06:14:24 -0000
@@ -39,7 +39,7 @@
 #endif

 #if @HAVE_WCTYPE_H@
-# if defined __DECC && __DECC_VER >= 60000000
+# if @HAVE_INCLUDE_NEXT@
 #  include_next <wctype.h>
 # endif
 #endif
@@ -50,7 +50,7 @@
 /* Include the original <wctype.h> if it exists.
    BeOS 5 has the functions but no <wctype.h>.  */
 #if @HAVE_WCTYPE_H@
-# if !(defined __DECC && __DECC_VER >= 60000000)
+# if ! @HAVE_INCLUDE_NEXT@
 #  include @ABSOLUTE_WCTYPE_H@
 # endif
 #endif
Index: modules/absolute-header
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/absolute-header,v
retrieving revision 1.1
diff -u -p -r1.1 absolute-header
--- modules/absolute-header     26 Dec 2006 18:42:09 -0000      1.1
+++ modules/absolute-header     17 May 2007 06:14:24 -0000
@@ -9,6 +9,10 @@ Depends-on:
 configure.ac:

 Makefile.am:
+# Use this preprocessor expression to decide whether #include_next works.
+# Do not rely on a 'configure'-time test for this, since the expression
+# might appear in an installed header, which is used by some other compiler.
+HAVE_INCLUDE_NEXT = (__GNUC__ || 60000000 <= __DECC_VER)

 Include:

Index: modules/fcntl
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/fcntl,v
retrieving revision 1.7
diff -u -p -r1.7 fcntl
--- modules/fcntl       26 Dec 2006 18:42:09 -0000      1.7
+++ modules/fcntl       17 May 2007 06:14:24 -0000
@@ -21,6 +21,7 @@ fcntl.h: fcntl_.h
        rm -f address@hidden $@
        { 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' \
              < $(srcdir)/fcntl_.h; \
        } > address@hidden
        mv address@hidden $@
Index: modules/inttypes
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/inttypes,v
retrieving revision 1.19
diff -u -p -r1.19 inttypes
--- modules/inttypes    18 Feb 2007 04:10:04 -0000      1.19
+++ modules/inttypes    17 May 2007 06:14:24 -0000
@@ -24,6 +24,7 @@ inttypes.h: inttypes_.h
        { 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/@''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' \
Index: modules/math
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/math,v
retrieving revision 1.7
diff -u -p -r1.7 math
--- modules/math        6 Apr 2007 20:55:44 -0000       1.7
+++ modules/math        17 May 2007 06:14:24 -0000
@@ -21,6 +21,7 @@ math.h: math_.h
        rm -f address@hidden $@
        { 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' \
              -e 's|@''GNULIB_FREXP''@|$(GNULIB_FREXP)|g' \
              -e 's|@''GNULIB_FREXPL''@|$(GNULIB_FREXPL)|g' \
              -e 's|@''GNULIB_LDEXPL''@|$(GNULIB_LDEXPL)|g' \
Index: modules/search
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/search,v
retrieving revision 1.1
diff -u -p -r1.1 search
--- modules/search      25 Mar 2007 02:45:24 -0000      1.1
+++ modules/search      17 May 2007 06:14:24 -0000
@@ -21,6 +21,7 @@ search.h: search_.h
        rm -f address@hidden $@
        { 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|@''GNULIB_TSEARCH''@|$(GNULIB_TSEARCH)|g' \
              -e 's|@''HAVE_TSEARCH''@|$(HAVE_TSEARCH)|g' \
Index: modules/signal
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/signal,v
retrieving revision 1.2
diff -u -p -r1.2 signal
--- modules/signal      1 May 2007 19:20:18 -0000       1.2
+++ modules/signal      17 May 2007 06:14:24 -0000
@@ -21,6 +21,7 @@ signal.h: signal_.h
        rm -f address@hidden $@
        { 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' \
              -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' \
Index: modules/stdint
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/stdint,v
retrieving revision 1.19
diff -u -p -r1.19 stdint
--- modules/stdint      16 Jan 2007 16:31:23 -0000      1.19
+++ modules/stdint      17 May 2007 06:14:24 -0000
@@ -29,6 +29,7 @@ stdint.h: stdint_.h
        { 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/@''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' \
Index: modules/stdio
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/stdio,v
retrieving revision 1.13
diff -u -p -r1.13 stdio
--- modules/stdio       25 Apr 2007 07:51:53 -0000      1.13
+++ modules/stdio       17 May 2007 06:14:24 -0000
@@ -21,6 +21,7 @@ stdio.h: stdio_.h
        rm -f address@hidden $@
        { 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' \
              -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' \
Index: modules/stdlib
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/stdlib,v
retrieving revision 1.3
diff -u -p -r1.3 stdlib
--- modules/stdlib      17 Mar 2007 19:02:51 -0000      1.3
+++ modules/stdlib      17 May 2007 06:14:24 -0000
@@ -22,6 +22,7 @@ stdlib.h: stdlib_.h
        rm -f address@hidden $@
        { 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' \
              -e 's|@''GNULIB_GETSUBOPT''@|$(GNULIB_GETSUBOPT)|g' \
              -e 's|@''GNULIB_MKDTEMP''@|$(GNULIB_MKDTEMP)|g' \
              -e 's|@''GNULIB_MKSTEMP''@|$(GNULIB_MKSTEMP)|g' \
Index: modules/string
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/string,v
retrieving revision 1.20
diff -u -p -r1.20 string
--- modules/string      17 Feb 2007 22:21:32 -0000      1.20
+++ modules/string      17 May 2007 06:14:24 -0000
@@ -22,6 +22,7 @@ string.h: string_.h
        rm -f address@hidden $@
        { 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' \
              -e 's|@''GNULIB_MBSLEN''@|$(GNULIB_MBSLEN)|g' \
              -e 's|@''GNULIB_MBSCHR''@|$(GNULIB_MBSCHR)|g' \
              -e 's|@''GNULIB_MBSRCHR''@|$(GNULIB_MBSRCHR)|g' \
Index: modules/sys_time
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/sys_time,v
retrieving revision 1.7
diff -u -p -r1.7 sys_time
--- modules/sys_time    4 Mar 2007 23:41:27 -0000       1.7
+++ modules/sys_time    17 May 2007 06:14:24 -0000
@@ -23,6 +23,7 @@ sys/time.h: sys_time_.h
        { 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/@''REPLACE_GETTIMEOFDAY''@/$(REPLACE_GETTIMEOFDAY)/g' \
              -e 's/@''HAVE_STRUCT_TIMEVAL''@/$(HAVE_STRUCT_TIMEVAL)/g' \
              < $(srcdir)/sys_time_.h; \
Index: modules/time
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/time,v
retrieving revision 1.4
diff -u -p -r1.4 time
--- modules/time        25 Mar 2007 15:34:56 -0000      1.4
+++ modules/time        17 May 2007 06:14:24 -0000
@@ -21,6 +21,7 @@ time.h: time_.h
        rm -f address@hidden $@
        { 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' \
              -e 's|@REPLACE_LOCALTIME_R''@|$(REPLACE_LOCALTIME_R)|g' \
              -e 's|@REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \
              -e 's|@REPLACE_STRPTIME''@|$(REPLACE_STRPTIME)|g' \
Index: modules/wchar
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/wchar,v
retrieving revision 1.1
diff -u -p -r1.1 wchar
--- modules/wchar       13 Jan 2007 05:23:37 -0000      1.1
+++ modules/wchar       17 May 2007 06:14:24 -0000
@@ -20,6 +20,7 @@ wchar.h: wchar_.h
        rm -f address@hidden $@
        { 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' \
            < $(srcdir)/wchar_.h; \
        } > address@hidden
        mv address@hidden $@
Index: modules/wctype
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/wctype,v
retrieving revision 1.6
diff -u -p -r1.6 wctype
--- modules/wctype      1 May 2007 18:21:31 -0000       1.6
+++ modules/wctype      17 May 2007 06:14:24 -0000
@@ -22,6 +22,7 @@ wctype.h: wctype_.h
        { 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/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \
              -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \
              < $(srcdir)/wctype_.h; \