[PATCH] build: pull in various gnulib fixes

[Eric Blake]

* gnulib: Update to latest.
* m4/gnulib-cache.m4: Reflect spawn-pipe module name change.
* src/builtin.c (includes): Likewise.
(define_user_macro): Alter comment to appease syntax-check.
* src/input.c (pop_wrapup): Likewise.
* src/output.c (undivert_all): Likewise.
* cfg.mk (local-checks-to-skip): Skip new rule.

Signed-off-by: Eric Blake <address@hidden>
---

There are still more gnulib changes that I hope to fold in and test,
such as preventing a nl_langinfo test failure on Irix 6.5, but this
did well on quite a range of systems (Linux, OpenBSD, FreeBSD, Cygwin,
Mac OSX, Solaris 10, mingw, and almost passing on Irix).  I'd really
like to release m4 1.4.15 before the year ends, if possible.

 ChangeLog          |    9 +++++++++
 cfg.mk             |    4 +++-
 gnulib             |    2 +-
 m4/gnulib-cache.m4 |    4 ++--
 src/builtin.c      |    4 ++--
 src/input.c        |    2 +-
 src/output.c       |    2 +-
 7 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c0eb2e5..dcefbe7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2010-12-24  Eric Blake  <address@hidden>

+       build: pull in various gnulib fixes
+       * gnulib: Update to latest.
+       * m4/gnulib-cache.m4: Reflect spawn-pipe module name change.
+       * src/builtin.c (includes): Likewise.
+       (define_user_macro): Alter comment to appease syntax-check.
+       * src/input.c (pop_wrapup): Likewise.
+       * src/output.c (undivert_all): Likewise.
+       * cfg.mk (local-checks-to-skip): Skip new rule.
+
        maint: reflect recent copyright assignment
        * AUTHORS: Add Raphael Poss.

diff --git a/cfg.mk b/cfg.mk
index efbac7f..3299f5d 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -25,8 +25,10 @@ update-copyright-env = \

 # Tests not to run as part of "make syntax-check".
 local-checks-to-skip =
+# We haven't yet turned on i18n
+local-checks-to-skip += sc_bindtextdomain
 # M4 intentionally uses a coding style that compiles under C++.
-local-checks-to-skip = sc_cast_of_x_alloc_return_value
+local-checks-to-skip += sc_cast_of_x_alloc_return_value
 # sc_copyright_check is currently broken for multi-line copyrights.
 local-checks-to-skip += sc_copyright_check

diff --git a/gnulib b/gnulib
index b86f488..7c98a69 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit b86f488e783121f54dbd44e17741fa3b29e9be9b
+Subproject commit 7c98a69028588fa133a9ea1b1fdae8e121b06f9d
diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
index ba783c3..6ddefc5 100644
--- a/m4/gnulib-cache.m4
+++ b/m4/gnulib-cache.m4
@@ -15,7 +15,7 @@


 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --local-dir=local --lib=libm4 
--source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests 
--aux-dir=build-aux --with-tests --with-c++-tests --avoid=lock-tests 
--avoid=tls-tests --makefile-name=gnulib.mk --no-libtool --macro-prefix=M4 
announce-gen assert autobuild avltree-oset binary-io c-stack clean-temp cloexec 
close-stream closein config-h dirname error execute fdl-1.3 fflush filenamecat 
fopen fopen-safer fseeko gendocs getopt-gnu git-version-gen gnu-web-doc-update 
gnumakefile gnupload gpl-3.0 ignore-value intprops maintainer-makefile 
manywarnings memchr2 mkstemp obstack pipe progname regex sigaction stdbool 
stdint stdlib-safer strsignal strstr strtod strtol unlocked-io update-copyright 
vc-list-files verror version-etc version-etc-fsf wait-process xalloc xoset 
xprintf xvasprintf-posix
+#   gnulib-tool --import --dir=. --local-dir=local --lib=libm4 
--source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests 
--aux-dir=build-aux --with-tests --with-c++-tests --avoid=lock-tests 
--avoid=tls-tests --makefile-name=gnulib.mk --no-libtool --macro-prefix=M4 
announce-gen assert autobuild avltree-oset binary-io c-stack clean-temp cloexec 
close-stream closein config-h dirname error execute fdl-1.3 fflush filenamecat 
fopen fopen-safer fseeko gendocs getopt-gnu git-version-gen gnu-web-doc-update 
gnumakefile gnupload gpl-3.0 ignore-value intprops maintainer-makefile 
manywarnings memchr2 mkstemp obstack progname regex sigaction spawn-pipe 
stdbool stdint stdlib-safer strsignal strstr strtod strtol unlocked-io 
update-copyright vc-list-files verror version-etc version-etc-fsf wait-process 
xalloc xoset xprintf xvasprintf-posix

 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([local])
@@ -54,10 +54,10 @@ gl_MODULES([
   memchr2
   mkstemp
   obstack
-  pipe
   progname
   regex
   sigaction
+  spawn-pipe
   stdbool
   stdint
   stdlib-safer
diff --git a/src/builtin.c b/src/builtin.c
index 4b714f8..111ee27 100644
--- a/src/builtin.c
+++ b/src/builtin.c
@@ -26,8 +26,8 @@

 #include "execute.h"
 #include "memchr2.h"
-#include "pipe.h"
 #include "regex.h"
+#include "spawn-pipe.h"
 #include "wait-process.h"

 #define ARG(i) (argc > (i) ? TOKEN_DATA_TEXT (argv[i]) : "")
@@ -284,7 +284,7 @@ free_macro_sequence (void)
 /*-----------------------------------------------------------------.
 | Define a predefined or user-defined macro, with name NAME, and   |
 | expansion TEXT.  MODE destinguishes between the "define" and the |
-| "pushdef" case.  It is also used from main ().                   |
+| "pushdef" case.  It is also used from main.                      |
 `-----------------------------------------------------------------*/

 void
diff --git a/src/input.c b/src/input.c
index c16f6f1..8c9203c 100644
--- a/src/input.c
+++ b/src/input.c
@@ -377,7 +377,7 @@ pop_input (void)
 }

 /*-------------------------------------------------------------------.
-| To switch input over to the wrapup stack, main () calls pop_wrapup |
+| To switch input over to the wrapup stack, main calls pop_wrapup    |
 | ().  Since wrapup text can install new wrapup text, pop_wrapup ()  |
 | returns false when there is no wrapup text on the stack, and true  |
 | otherwise.                                                         |
diff --git a/src/output.c b/src/output.c
index 75c8876..807fc2d 100644
--- a/src/output.c
+++ b/src/output.c
@@ -947,7 +947,7 @@ insert_diversion (int divnum)

 /*----------------------------------------------------------------.
 | Get back all diversions.  This is done just before exiting from |
-| main (), and from m4_undivert (), if called without arguments.  |
+| main, and from m4_undivert (), if called without arguments.     |
 `----------------------------------------------------------------*/

 void
-- 
1.7.3.4