branch-1_4 reduce make clutter

[Eric Blake]

This patch reduces the amount of output produced during make, reducing the 
required screen width for acheiving one file compiled per unwrapped output line.

2006-10-17  Eric Blake  <address@hidden>

        * m4/gnulib-cache.m4: Update with 'gnulib-tool --import
        config-h'.
        * configure.ac (AC_CONFIG_HEADERS): Create config.h alongside
        gnulib headers, rather than in top directory.
        * src/Makefile.am (AUTOMAKE_OPTIONS): Add nostdinc, to reduce make
        output clutter.

Index: configure.ac
===================================================================
RCS file: /sources/m4/m4/configure.ac,v
retrieving revision 1.36.2.29
diff -u -r1.36.2.29 configure.ac
--- configure.ac        13 Oct 2006 13:18:05 -0000      1.36.2.29
+++ configure.ac        17 Oct 2006 16:05:38 -0000
@@ -26,7 +26,7 @@
 m4_pattern_forbid([^M4_[A-Z]])
 
 AC_CONFIG_SRCDIR([src/m4.h])
-AC_CONFIG_HEADERS([config.h:config-h.in])
+AC_CONFIG_HEADERS([lib/config.h:lib/config.hin])
 
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
Index: m4/gnulib-cache.m4
===================================================================
RCS file: /sources/m4/m4/m4/Attic/gnulib-cache.m4,v
retrieving revision 1.1.2.16
diff -u -r1.1.2.16 gnulib-cache.m4
--- m4/gnulib-cache.m4  13 Oct 2006 22:25:32 -0000      1.1.2.16
+++ m4/gnulib-cache.m4  17 Oct 2006 16:05:38 -0000
@@ -15,11 +15,11 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --lib=libm4 --source-base=lib --m4-base=m4 --
doc-base=doc --aux-dir=. --no-libtool --macro-prefix=M4 binary-io clean-temp 
cloexec close-stream closeout error fdl fopen-safer free gendocs getopt 
gnupload mkstemp obstack regex stdlib-safer strtol unlocked-io verror xalloc 
xvasprintf
+#   gnulib-tool --import --dir=. --lib=libm4 --source-base=lib --m4-base=m4 --
doc-base=doc --aux-dir=. --no-libtool --macro-prefix=M4 binary-io clean-temp 
cloexec close-stream closeout config-h error fdl fopen-safer free gendocs 
getopt gnupload mkstemp obstack regex stdlib-safer strtol unlocked-io verror 
xalloc xvasprintf
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([])
-gl_MODULES([binary-io clean-temp cloexec close-stream closeout error fdl fopen-
safer free gendocs getopt gnupload mkstemp obstack regex stdlib-safer strtol 
unlocked-io verror xalloc xvasprintf])
+gl_MODULES([binary-io clean-temp cloexec close-stream closeout config-h error 
fdl fopen-safer free gendocs getopt gnupload mkstemp obstack regex stdlib-safer 
strtol unlocked-io verror xalloc xvasprintf])
 gl_AVOID([])
 gl_SOURCE_BASE([lib])
 gl_M4_BASE([m4])
Index: src/Makefile.am
===================================================================
RCS file: /sources/m4/m4/src/Attic/Makefile.am,v
retrieving revision 1.18.2.3
diff -u -r1.18.2.3 Makefile.am
--- src/Makefile.am     11 Sep 2006 13:17:21 -0000      1.18.2.3
+++ src/Makefile.am     17 Oct 2006 16:05:38 -0000
@@ -19,6 +19,7 @@
 ##
 ## This file written by Eric Blake <address@hidden>
 
+AUTOMAKE_OPTIONS = nostdinc
 AM_CPPFLAGS = -I$(top_srcdir)/lib -I../lib
 bin_PROGRAMS = m4
 m4_SOURCES = m4.h m4.c builtin.c debug.c eval.c format.c freeze.c input.c \