[PATCH] maint: use announce-gen's new --mail-headers.

[Joel E. Denny]

I cherry-picked the first patch below from master to branch-2.4.3.  It was 
already on branch-2.5.  I then applied the second patch to all three 
branches.  I applied the third patch to master.  It is not relevant to the 
other branches.

>From 189ba6670f836d4c4f9042c3e601976b12b25838 Mon Sep 17 00:00:00 2001
From: Akim Demaille <address@hidden>
Date: Mon, 17 Aug 2009 10:51:08 +0200
Subject: [PATCH] build: require gettext 0.17.

Suggested by Bruno Haible.
http://lists.gnu.org/archive/html/bug-bison/2009-08/msg00009.html

        * configure.ac: require gettext 0.17 to ensure compatibility with
        gnulib.
(cherry picked from commit af6d23584362436f19baadc311987b65849ce024)
---
 ChangeLog    |    9 +++++++++
 configure.ac |    5 +++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9f621d2..647674a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-08-17  Akim Demaille  <address@hidden>
+
+       build: require gettext 0.17.
+
+       Suggested by Bruno Haible.
+       http://lists.gnu.org/archive/html/bug-bison/2009-08/msg00009.html
+       * configure.ac: require gettext 0.17 to ensure compatibility with
+       gnulib.
+
 2010-07-24  Joel E. Denny  <address@hidden>
 
        tests: handle Valgrind that complains about >&-.
diff --git a/configure.ac b/configure.ac
index 931a580..6539dc7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -130,9 +130,10 @@ BISON_PREREQ_SUBPIPE
 BISON_PREREQ_TIMEVAR
 
 # Gettext.
-# We've never tested with gettext versions before 0.15, so play it safe.
+# We use gnulib, which is only guaranteed to work properly with the
+# latest Gettext.
 AM_GNU_GETTEXT([external], [need-ngettext])
-AM_GNU_GETTEXT_VERSION([0.15])
+AM_GNU_GETTEXT_VERSION([0.17])
 BISON_I18N
 
 # Internationalized parsers.
-- 
1.7.0.4

>From e5655564583f2f704dd85d6f602f5fcd86f87467 Mon Sep 17 00:00:00 2001
From: Joel E. Denny <address@hidden>
Date: Sun, 25 Jul 2010 15:53:18 -0400
Subject: [PATCH] maint: use announce-gen's new --mail-headers.

* HACKING (Announce): Update instructions.
* cfg.mk (announcement_Cc_): Define.
* configure.ac (AM_GNU_GETTEXT_VERSION): Update to 0.18 as
required by latest gnulib.
* gnulib: Update to latest.
---
 ChangeLog             |    9 +++++++++
 HACKING               |   27 ++++++++++++++-------------
 cfg.mk                |    4 ++++
 configure.ac          |    2 +-
 gnulib                |    2 +-
 lib/.cvsignore        |    2 ++
 lib/.gitignore        |    2 ++
 m4/.cvsignore         |    2 ++
 m4/.gitignore         |    2 ++
 runtime-po/.cvsignore |    2 ++
 runtime-po/.gitignore |    2 ++
 11 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 647674a..5bd1a04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-07-25  Joel E. Denny  <address@hidden>
+
+       maint: use announce-gen's new --mail-headers.
+       * HACKING (Announce): Update instructions.
+       * cfg.mk (announcement_Cc_): Define.
+       * configure.ac (AM_GNU_GETTEXT_VERSION): Update to 0.18 as
+       required by latest gnulib.
+       * gnulib: Update to latest.
+
 2009-08-17  Akim Demaille  <address@hidden>
 
        build: require gettext 0.17.
diff --git a/HACKING b/HACKING
index cef6358..891b596 100644
--- a/HACKING
+++ b/HACKING
@@ -338,19 +338,20 @@ To generate a template announcement file:
   make RELEASE_TYPE=alpha gpg_key_ID=F125BDF3 announcement
 
 where alpha can be replaced by beta or stable and F125BDF3 should be
-replaced with your key ID.  For an example of how to fill out the
-template, search the mailing list archives for the most recent release
-announcement.
-
-Complete/fix the announcement file, and send it at least to
address@hidden (if a real release, or a ``serious beta''),
address@hidden, address@hidden, address@hidden,
-and address@hidden
-
-Send the same announcement on the comp.compilers newsgroup by sending
-email to address@hidden  Do not make any Cc as the moderator will
-throw away anything cross-posted or Cc'ed.  It really needs to be a
-separate message.
+replaced with your key ID.
+
+Complete/fix the announcement file.  The generated list of recipients
+(address@hidden, address@hidden, address@hidden,
address@hidden, and address@hidden) is
+appropriate for a stable release or a ``serious beta''.  For any other
+release, drop at least address@hidden  For an example of how to fill
+out the rest of the template, search the mailing list archives for the
+most recent release announcement.
+
+For a stable release, send the same announcement on the comp.compilers
+newsgroup by sending email to address@hidden  Do not make any Cc as
+the moderator will throw away anything cross-posted or Cc'ed.  It really
+needs to be a separate message.
 
 ** Bump the version number
 In configure.ac.  Run `make'.  So that developers don't accidentally add new
diff --git a/cfg.mk b/cfg.mk
index 0fda0dc..a43ca2f 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -44,6 +44,10 @@ gnulib_dir = $(srcdir)/gnulib
 
 bootstrap-tools = autoconf,automake,flex,gnulib
 
+announcement_Cc_ = \
+  address@hidden, address@hidden, address@hidden, \
+  address@hidden
+
 update-copyright: update-b4-copyright update-package-copyright-year
 update-copyright-env = \
   UPDATE_COPYRIGHT_FORCE=1
diff --git a/configure.ac b/configure.ac
index 6539dc7..c088055 100644
--- a/configure.ac
+++ b/configure.ac
@@ -133,7 +133,7 @@ BISON_PREREQ_TIMEVAR
 # We use gnulib, which is only guaranteed to work properly with the
 # latest Gettext.
 AM_GNU_GETTEXT([external], [need-ngettext])
-AM_GNU_GETTEXT_VERSION([0.17])
+AM_GNU_GETTEXT_VERSION([0.18])
 BISON_I18N
 
 # Internationalized parsers.
diff --git a/gnulib b/gnulib
index 1778ee9..b48afd8 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 1778ee9e7d0e150a37db66a0e51c1a56755aab4f
+Subproject commit b48afd89ec9be56156d6e2bebfdf457c778fe5c3
>From 42765f8e7de1837f67e7aea3564e05cfa1ec4b89 Mon Sep 17 00:00:00 2001
From: Joel E. Denny <address@hidden>
Date: Sun, 25 Jul 2010 21:24:02 -0400
Subject: [PATCH] build: fix our adjustments for gnulib files in lib.

* configure.ac: For prepending lib/ to the values of config
variables, fix detection of empty values.  Also, due to recent
gnulib changes, add LIBUNISTRING_UNITYPES_H and
LIBUNISTRING_UNIWIDTH_H to the list of those variables.
---
 ChangeLog    |    8 ++++++++
 configure.ac |    3 ++-
 2 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e2846ca..188a594 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2010-07-25  Joel E. Denny  <address@hidden>
 
+       build: fix our adjustments for gnulib files in lib.
+       * configure.ac: For prepending lib/ to the values of config
+       variables, fix detection of empty values.  Also, due to recent
+       gnulib changes, add LIBUNISTRING_UNITYPES_H and
+       LIBUNISTRING_UNIWIDTH_H to the list of those variables.
+
+2010-07-25  Joel E. Denny  <address@hidden>
+
        maint: use announce-gen's new --mail-headers.
        * HACKING (Announce): Update instructions.
        * cfg.mk (announcement_Cc_): Define.
diff --git a/configure.ac b/configure.ac
index 1fd2256..5fe57bf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -165,9 +165,10 @@ gt_JAVAEXEC
 # So prefix paths with lib/.  See also etc/prefix-gnulib-mk.
 gl_LIBOBJS=`echo "$gl_LIBOBJS" | sed -e 's, , lib/,g'`
 for ac_var in ALLOCA_H ERRNO_H FCNTL_H GETOPT_H INTTYPES_H \
+              LIBUNISTRING_UNITYPES_H LIBUNISTRING_UNIWIDTH_H \
               STDBOOL_H STDINT_H SYS_WAIT_H WCHAR_H WCTYPE_H
 do
-  eval "test 'x$ac_var' = x || $ac_var=lib/\$$ac_var"
+  eval "test x\$$ac_var = x || $ac_var=lib/\$$ac_var"
 done
 AC_CONFIG_FILES([Makefile
                 po/Makefile.in
-- 
1.7.0.4