Merge branch 'maint'

* maint:
  tests: avoid spurious failure of libtool and gettext tests

diff --cc ChangeLog
index 0a24058695f68a590c6cfdca2442107ea30a278d,e6881623365ddd5ea008dec9ae8bc9c13c4d80b8..64bf976df807cbbb6ac65eb571d3421c91b624d1
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,33 -1,41 +1,71 @@@
+ 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>
 +
 +      Merge branch 'maint' into master.
 +      * m4/regex.m4: Bump serial number by some notches, for good
 +      measure.  Prefer the deprecation message from maint over that
 +      from master.
 +      * m4/python.m4: Bump serial number.
 +      * tests/Makefile.am (canon6.log): Depend on `libtool-macros.log'.
 +      (canon7.log): Likewise.
 +      (extradep2.log): Likewise.
 +      (ar-lib4.log): Likewise.
 +      (ar-lib6a.log): Likewise.
 +      (ar-lib6b.log): Likewise.
 +      (vartypo2): Likewise.
 +      (posixsubst-ltlibraries.log): Likewise.
 +      * tests/defs: Adjust the path of the included `get.sh' scripts
 +      generated by `libtool-macros.test' and `gettext-macros.test'.
 +      * aclocal.m4: Delete, it's auto-generated now. 
 +      * configure: Likewise.
 +      * Makefile.in: Likewise.
 +      * doc/Makefile.in: Likewise.
 +      * m4/Makefile.in: Likewise.
 +      * tests/Makefile.in: Likewise.
 +      * lib/Makefile.in: Likewise.
 +      * lib/am/Makefile.in: Likewise.
 +      * lib/Automake/Makefile.in: Likewise.
 +      * lib/Automake/tests/Makefile.in: Likewise.
 +      * .gitignore: Correctly ignored the autogenerated files
 +      that are not committed anymore.
 +
  2011-12-22  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        hacking: distribute it, and mention it in the ChangeLog