Merge branch 'maint'

diff --cc ChangeLog
index ed10bac827d05374e6c014dbe7ab90aabd369823,b69d4e581cb7f26a55109da18e92046ee7db560a..40d770e3d85c074b1a93538b4255872464b857e0
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,28 +1,33 @@@
+ 2010-11-16  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       Fix regression in colon{5,6}.test (failures on AIX 5.3).
+       * tests/colon5.test: Also substitute `@SHELL@' with `$SHELL' when
+       post-processing the generated Makefile.in, to work around a bug
+       of AIX 5.3 make which doesn't allow setting the `$(SHELL)' macro
+       on the commend line.  Calls to `$MAKE' adjusted accordingly.
+       * tests/colon6.test: Likewise.
+       Regression introduced in commit v1.11-175-gf9fe878 "Modernize,
+       improve and/or extend tests `colon*.test", and reported by Ralf
+       Wildenhues.
+ 
+ 2010-11-16  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       Fix regression in ansi.test (failure on AIX 5.3).
+       * tests/ansi.test: Remove redundant hackish check done using a
+       hand-postprocessed Makefile.in.  This checs worked by setting
+       the `$(SHELL)' macro on the command line of make, but this is
+       not supported by the AIX 5.3 make implementation.
+       This bug has been lurking for a long time, and was activated by
+       commit v1.11-125-gc1f6cdb "Enable `errexit' shell flag in various
+       tests".  Report by Ralf Wildenhues.
+ 
  2010-11-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
  
 +      backcompat5.test: avoid '##'-style comments inside recipe commands.
 +      * tests/backcompat5.test: Remove double-hash comments
 +      from makefile rule commands, they are not part of the
 +      Automake API.  Fixes testsuite failure with Tru64 make.
 +
        tests: avoid '##'-style comments inside recipe commands.
        * tests/confh.test, tests/confh8.test: Remove
        double-hash comments from makefile rule commands, they