update to newer automake

[Eric Blake]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

I'm applying this to branch-1.6, and a similar patch to master.  Now that
automake's silent-rule generates a configure option instead of forcing the
issue (not to mention that automake --silent-rules, which I used for the
1.4.13 release, is gone), I am comfortable enabling it in configure.ac.
It also speeds up the gnulib unit tests and makes output nicer to read in
that portion of the testsuite, and makes dist-xz automatic.

Note that automake 1.10b is beta, and resides on alpha.gnu.org; hopefully
a stable 1.11 is released before too long.

- --
Don't work too hard, make some time for fun as well!

Eric Blake             address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAknl4tUACgkQ84KuGfSFAYACJACbBNbtgcWoRvWECP3ovwdsn0ud
dZcAmwRh+7uElx+MWd/+RPziC/+omARo
=3ASH
-----END PGP SIGNATURE-----

>From 19141fb1c466da0b97f5606a3c7ab53123262131 Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Wed, 15 Apr 2009 07:20:28 -0600
Subject: [PATCH 1/2] Mention release of 1.4.13.

* NEWS: Update to match release on branch-1.4.
* doc/m4.texinfo (History): Update release history.
(copying): Finish conversion to GFDL 1.3, started 2008-11-04.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog      |    7 +++++++
 NEWS           |    2 +-
 doc/m4.texinfo |   10 ++++++----
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8b7b347..553880c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-04-15  Eric Blake  <address@hidden>
+
+       Mention release of 1.4.13.
+       * NEWS: Update to match release on branch-1.4.
+       * doc/m4.texinfo (History): Update release history.
+       (copying): Finish conversion to GFDL 1.3, started 2008-11-04.
+
 2009-03-23  Eric Blake  <address@hidden>

        Don't force file overwrites during bootstrap.
diff --git a/NEWS b/NEWS
index cd473d2..f1d641a 100644
--- a/NEWS
+++ b/NEWS
@@ -149,7 +149,7 @@ contains the following beta features that were deemed worth 
deferring until

 ** A number of portability improvements inherited from gnulib.

-* Noteworthy changes in Version 1.4.13 (2008-12-??) [stable]
+* Noteworthy changes in Version 1.4.13 (2009-04-01) [stable]
   Released by Eric Blake, based on git version 1.4.12.*

 ** The manual is now distributed under the terms of FDL 1.3.
diff --git a/doc/m4.texinfo b/doc/m4.texinfo
index 269e0d2..e1b3a1b 100644
--- a/doc/m4.texinfo
+++ b/doc/m4.texinfo
@@ -49,7 +49,7 @@
 @quotation
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the @acronym{GNU} Free Documentation License,
-Version 1.2 or any later version published by the Free Software
+Version 1.3 or any later version published by the Free Software
 Foundation; with no Invariant Sections, no Front-Cover Texts, and no
 Back-Cover Texts.  A copy of the license is included in the section
 entitled address@hidden Free Documentation License.''
@@ -398,11 +398,13 @@ History
 released 1.4.3 and 1.4.4.  And in 2006, Eric Blake joined the team and
 prepared patches for the release of 1.4.5, 1.4.6, 1.4.7, and 1.4.8.
 More bug fixes were incorporated in 2007, with releases 1.4.9 and
-1.4.10, closing the series with 1.4.11 and 1.4.12 in 2008.
+1.4.10.  Eric continued with some portability fixes for 1.4.11 and
+1.4.12 in 2008, and 1.4.13 in 2009.

 Additionally, in 2008, Eric rewrote the scanning engine to reduce
-recursive evaluation from quadratic to linear complexity, released as M4
-1.6.  The 1.x branch series remains open for bug fixes.
+recursive evaluation from quadratic to linear complexity.  This was
+released as M4 1.6 in 2009.  The 1.x branch series remains open for bug
+fixes.

 Meanwhile, development has continued on new features for @code{m4}, such
 as dynamic module loading and additional builtins.  When complete,
-- 
1.6.1.2


>From 4b6f4e66d8ccaea1f9f4e9bef53542c554f9f980 Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Wed, 1 Apr 2009 13:02:08 -0600
Subject: [PATCH 2/2] Require newer automake features.

* configure.ac (AM_INIT_AUTOMAKE): Add dist-xz, color-tests,
parallel-tests, and silent-rules.
* HACKING: Update minimum requirements.
* gnulib: Update to latest directions.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog    |    6 ++++++
 HACKING      |    6 +++---
 configure.ac |    3 ++-
 gnulib       |    2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 553880c..0af8ede 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2009-04-15  Eric Blake  <address@hidden>

+       Require newer automake features.
+       * configure.ac (AM_INIT_AUTOMAKE): Add dist-xz, color-tests,
+       parallel-tests, and silent-rules.
+       * HACKING: Update minimum requirements.
+       * gnulib: Update to latest directions.
+
        Mention release of 1.4.13.
        * NEWS: Update to match release on branch-1.4.
        * doc/m4.texinfo (History): Update release history.
diff --git a/HACKING b/HACKING
index 313c09e..38d2ade 100644
--- a/HACKING
+++ b/HACKING
@@ -43,9 +43,9 @@ and is not part of a release distribution.
 * Before you can build from git, you need to bootstrap.  This requires:
   - A pre-installed version of GNU M4 1.4.5 or later, built from a package
   - Autoconf 2.60 or later
-  - Automake 1.10.1 or later
+  - Automake 1.10b or later
   - Help2man 1.29 or later
-  - LZMA Utils 4.32 or later (from <http://tukaani.org/lzma/>)
+  - Xz 4.999.8beta or later (from <http://tukaani.org/xz/>)
   - Texinfo 4.8 or later
   - Any prerequisites of the above (such as perl, tex)

@@ -221,7 +221,7 @@ yyyy-mm-dd  Name of Author  <address@hidden>  (tiny change)

 * Make sure you are happy with the particular gnulib version recorded as
   the gnulib submodule.  If necessary to update to the latest, run:
-    git submodule foreach git pull
+    git submodule foreach git pull origin master
     git commit -m 'Update gnulib submodule to latest.' gnulib

 * Update the version number in NEWS and ChangeLog, and mention in README
diff --git a/configure.ac b/configure.ac
index 85231dd..2be55bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,8 @@ AC_INIT([GNU M4], m4_esyscmd([build-aux/git-version-gen 
.tarball-version]),
   address@hidden)
 AC_CONFIG_AUX_DIR([build-aux])

-AM_INIT_AUTOMAKE([1.10.1 dist-bzip2 dist-lzma gnu])
+AM_INIT_AUTOMAKE([1.10b dist-bzip2 dist-lzma dist-xz color-tests
+parallel-tests silent-rules gnu])

 m4_pattern_forbid([^M4_[A-Z]])

diff --git a/gnulib b/gnulib
index 0add5d7..8fdb848 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 0add5d71522a4be3ec75152f22b4f61aeaf1d1b2
+Subproject commit 8fdb8486e14c433b2b277eb11c97e859b282e7d1
-- 
1.6.1.2