I pushed the following commit (plus many generated changes) to branch-2.5 and master.
>From a898435b25eca4869e8c49b2b0fb1f649b030ce7 Mon Sep 17 00:00:00 2001 From: Joel E. Denny <[email protected]> Date: Sat, 16 Apr 2011 14:59:32 -0400 Subject: [PATCH] gnulib, autoconf: update. * README-hacking (Updating a submodule): Give advice on how to determine the versions of gnulib and autoconf to which we should update. (Release Procedure): Note that submodules should be updated. * bootstrap.conf (gnulib_modules): Rename pipe to spawn-pipe as suggested in updated gnulib NEWS. * gnulib: Choose a stable snapshot according to advice in Bison's README-hacking. * po/POTFILES.in (lib/pipe.c): Rename to... (lib/spawn-pipe.c): ... this. * src/output.c: Update to include spawn-pipe.h. * submodules/autoconf: Update to latest for improvement in m4.m4 that excludes M4 with buggy strstr. The only other changes to files that we use are copyright updates. --- .gitignore | 2 + ChangeLog | 18 ++++++ README-hacking | 16 ++++++ bootstrap | 138 ++++++++++++++++++++++++++++++------------------ bootstrap.conf | 4 +- build-aux/.gitignore | 2 + doc/.gitignore | 2 + gnulib | 2 +- lib/.gitignore | 16 +++++- m4/.gitignore | 10 +++- po/.gitignore | 2 + po/POTFILES.in | 2 +- runtime-po/.gitignore | 2 + src/output.c | 2 +- submodules/autoconf | 2 +- 15 files changed, 159 insertions(+), 61 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0a95d2f..70ee004 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +2011-04-16 Joel E. Denny <[email protected]> + + gnulib, autoconf: update. + * README-hacking (Updating a submodule): Give advice on how to + determine the versions of gnulib and autoconf to which we should + update. + (Release Procedure): Note that submodules should be updated. + * bootstrap.conf (gnulib_modules): Rename pipe to spawn-pipe as + suggested in updated gnulib NEWS. + * gnulib: Choose a stable snapshot according to advice in Bison's + README-hacking. + * po/POTFILES.in (lib/pipe.c): Rename to... + (lib/spawn-pipe.c): ... this. + * src/output.c: Update to include spawn-pipe.h. + * submodules/autoconf: Update to latest for improvement in m4.m4 + that excludes M4 with buggy strstr. The only other changes to + files that we use are copyright updates. + 2011-04-09 Joel E. Denny <[email protected]> Fix missing updates to GPLv3. diff --git a/README-hacking b/README-hacking index f6b8903..bd66a9b 100644 --- a/README-hacking +++ b/README-hacking @@ -158,6 +158,20 @@ Register your changes. $ git checkin ... +For a suggestion of what gnulib commit might be stable enough for a +formal release, see the ChangeLog in the latest gnulib snapshot at: + + http://erislabs.net/ianb/projects/gnulib/ + +The autoconf files we use are currently: + + m4/m4.m4 + lib/m4sugar/m4sugar.m4 + lib/m4sugar/foreach.m4 + +These files don't change very often in autoconf, so it should be +relatively straight-forward to examine the differences in order to +decide whether to update. * Test suite @@ -200,6 +214,8 @@ release: * Release Procedure +** Update the submodules. See above. + ** Try to get the *.pot files to the Translation Project at least one week before a stable release, to give them time to translate them. Before generating the *.pot files, make sure that po/POTFILES.in and diff --git a/bootstrap.conf b/bootstrap.conf index 02ddc05..d5a3399 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -20,8 +20,8 @@ gnulib_modules=' announce-gen argmatch assert config-h c-strcase configmake dirname error extensions fopen-safer gendocs getopt-gnu gettext git-version-gen hash inttypes javacomp-script javaexec-script - maintainer-makefile malloc-gnu mbswidth obstack pipe quote quotearg - realloc-posix stdbool stpcpy strerror strtoul strverscmp unistd + maintainer-makefile malloc-gnu mbswidth obstack quote quotearg + realloc-posix spawn-pipe stdbool stpcpy strerror strtoul strverscmp unistd unistd-safer unlocked-io update-copyright unsetenv verify warnings xalloc xalloc-die xstrndup diff --git a/gnulib b/gnulib index 9aa2d4c..eff4c03 160000 --- a/gnulib +++ b/gnulib @@ -1 +1 @@ -Subproject commit 9aa2d4c522f12870229df0fd01d3140bddf94317 +Subproject commit eff4c0360a0de49d22629d3bdbd15460c0615cee diff --git a/po/POTFILES.in b/po/POTFILES.in index 8c1b596..b62e8a1 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -22,7 +22,7 @@ lib/bitset_stats.c lib/error.c lib/getopt.c lib/obstack.c -lib/pipe.c +lib/spawn-pipe.c lib/quotearg.c lib/timevar.c lib/w32spawn.h diff --git a/src/output.c b/src/output.c index 5e28ef9..7f4ca64 100644 --- a/src/output.c +++ b/src/output.c @@ -24,8 +24,8 @@ #include <configmake.h> #include <error.h> #include <get-errno.h> -#include <pipe.h> #include <quotearg.h> +#include <spawn-pipe.h> #include <timevar.h> #include <wait-process.h> diff --git a/submodules/autoconf b/submodules/autoconf index 2b0d95f..8cb0174 160000 --- a/submodules/autoconf +++ b/submodules/autoconf @@ -1 +1 @@ -Subproject commit 2b0d95faef68d7ed7c08b0edb9ff1c38728376fa +Subproject commit 8cb01740a0b7044feafcc51ea980583311e52a99 -- 1.7.0.4
