Merge branch 'tests-libtool-gettext-requirements' into maint

* tests-libtool-gettext-requirements:
  tests: avoid spurious failure of libtool and gettext tests

diff --cc ChangeLog
index 26e4a2d,94b1b44..e688162
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,88 -1,41 +1,126 @@@
+ 2011-12-23  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       tests: avoid spurious failure of libtool and gettext tests
+ 
+       On Solaris 10 (and presumably earlier), /bin/sh trips up on
+       here-documents that contains a command substitution *and* are
+       fed to a shell function:
+ 
+         # All as expected.
+         $ cat <<END
+         `pwd`
+         END
+         /home/stefano
+         $ echo status = $?
+         status = 0
+ 
+         # An apparently innocuous function ...
+         $ kitty () { cat; }
+         # ... but hilarity ensues!
+         $ kitty <<END
+         `pwd`
+         END
+         /tmp/sh137723: cannot open
+         $ echo status = $?
+         status = 1
+ 
+       We need to work around this misbehaviour in a couple of our
+       tests (whose failures where causing cascading failures in a
+       lot of other tests).
+ 
+       * tests/gettext-macros.test: Avoid the use of command substitution
+       in a here-document passed to the `indent' function, by using the
+       `echo' builtin instead.
+       * tests/libtool-macros.test: Likewise.
+ 
+       See also:
+       <http://lists.gnu.org/archive/html/bug-autoconf/2011-12/msg00001.html>
+ 
 +2011-12-22  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      hacking: distribute it, and mention it in the ChangeLog
 +      Not distributing the HACKING file might make it more difficult,
 +      for some random curious user, to get informed about or interested
 +      in the Automake development process, or to send us patches.
 +      * Makefile.am (EXTRA_DIST): Add HACKING.
 +      * HACKING: It's OK to distribute this file, and to mention it in
 +      the ChangeLog.
 +
 +2011-12-22  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      regex: deprecate the obsolete macro AM_WITH_REGEX
 +      This is a backport of commit v1.11-433-g37b0aee.
 +      Today, practically nobody uses the GNU rx library, which, according
 +      to its own website <http://www.gnu.org/software/rx/rx.html>, has
 +      been "decommissioned".  Consequently, the automake-provided macro
 +      AM_WITH_REGEX is not used nor required anymore.  Deprecate it, so
 +      that it will be possible to safely remove it in the next major
 +      automake version.
 +      * m4/regex.m4 (AM_WITH_REGEX): Give a warning of the class
 +      `obsolete' when this macro is used.
 +      * doc/automake.texi (Public Macros): Move description of
 +      `AM_WITH_REGEX' from here ...
 +      (Obsolete Macros): ... to here, and declare it as obsolete
 +      and "to be removed in a future version".
 +      * tests/regex-obsolete.test: New test.
 +      * tests/Makefile.am (TESTS): Add it.
 +      * NEWS: Update.
 +      See also:
 +      <http://lists.gnu.org/archive/html/automake-patches/2010-11/msg00131.html>
 +
 +2011-12-22  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      maint: distribute .xz tarballs, not .bz2 ones
 +      Many GNU packages are moving towards xz-compressed tarballs, so
 +      let's follow suit, by dropping the creation and distribution of
 +      a bzip2-compressed tarball and switching to xz instead.
 +      For compatibility and safeness, we will continue to create and
 +      distribute a gzip-compressed tarball as well.
 +      * configure.ac (AM_INIT_AUTOMAKE): Drop `dist-bzip2', add
 +      `dist-xz'.
 +      * NEWS: Update
 +      Suggested by Jim Meyering.
 +
 +2011-12-22  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      include: avoid "deleted .am file" problem
 +      * automake.in (handle_configure): When processing `configure.am',
 +      also expand `HAVE-MAKEFILE-IN-DEPS' to a boolean telling whether
 +      `MAKEFILE-IN-DEPS' is empty or not.
 +      * lib/am/configure.am [?HAVE-MAKEFILE-IN-DEPS?]
 +      (%MAKEFILE-IN-DEPS%): New target without dependencies, to
 +      avoid the "deleted .am file" problem.  Emit this only when
 +      `?HAVE-MAKEFILE-IN-DEPS?' is true, to avoid generating an
 +      "empty" dependency declaration.
 +      * tests/deleted-am.test: Make grepping of error message stricter.
 +      * tests/dist-missing-am.test: Likewise.
 +      * tests/remake-deleted-am.test: New test.
 +      * tests/remake-deleted-am-2.test: Likewise.
 +      * tests/remake-deleted-am-subdir.test: Likewise.
 +      * tests/remake-renamed-am.test: Likewise.
 +      * tests/makefile-deps.test: Likewise.
 +      * tests/Makefile.am (TESTS): Add the new tests.
 +      * NEWS: Update.
 +      Fixes automake bug#9768.
 +      Report by Peter Johansson.
 +      See also commit `Release-1-10-40-gd0ebf71', which fixed a similar
 +      problem for .m4 files included by configure.ac.
 +
 +2011-12-22  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      maint: better use of autoconf 2.68 features
 +      * configure.ac: Now that Automake requires autoconf 2.68 for its
 +      own bootstrapping and build system, we can assume that PACKAGE_URL
 +      gets automatically AC_SUBT'd.
 +
 +2011-12-22  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      cosmetics: use proper m4 quoting in configure.ac
 +      * configure.ac (AC_CONFIG_SRCDIR): Use proper m4 quoting
 +      for its arguments.
 +      (AC_CONFIG_AUX_DIR): Likewise.
 +      (AC_PROG_PATH): Likewise.
 +
  2011-12-14  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        tests: better handling of gettext and libtool requirements