Merge branch 'maint'

diff --cc ChangeLog
index a5af5af,eb2a238..bbb9187
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,30 -1,26 +1,53 @@@
+ 2010-06-08  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       Enable `errexit' shell flag in some test scripts.
+       * tests/subcond.test: Enabled `errexit' shell flag, and related
+       minor changes.
+       * tests/subst.test: Likewise.
+       * tests/vars.test: Likewise.
+       * tests/version4.test: Likewise.
+       * tests/vpath.test: Likewise.
+       * tests/vtexi2.test: Likewise.
+       * tests/werror.test: Likewise.
+       * tests/whoami.test: Likewise.
+       * tests/tags.test: Likewise, and avoid to crate an useless dummy
+       header file.
+       * tests/acsilent.test: Likewise, and don't use an easily-avoided
+       command substitution.
+       * tests/unused.test: Likewise, and don't use an easily-avoided
+       command substitution.
+       * tests/version.test: Likewise, and avoid deprecated constructs
+       in the generated `configure.in'.
+       * tests/version2.test: Likewise, and avoid deprecated constructs
+       in the generated `configure.in'.
+ 
 +2010-06-07  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +          Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +      Improve declaration of dependencies in the testsuite.
 +      * tests/Makefile.am (check_SCRIPTS): Remove.  Instead, let ...
 +      ($(TEST_LOGS)): ... all test logs depend on the scripts.
 +      * test/gen-parallel-tests: For each parallel test foo-p.test,
 +      let `foo-p.log' also depend on `foo.test', since it is sourced.
 +
 +2010-06-06  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +      Coverage for TAGS_DEPENDENCIES warning.
 +      * tests/tags2.test: New test.
 +      * tests/Makefile.am: Update.
 +
 +      Coverage for use of anachronistic variables.
 +      * tests/oldvars.test: New test.
 +      * tests/Makefile.am: Update.
 +
 +      Testsuite coverage for bogus macro file serial numbers.
 +      * tests/acloca18.test: Also test ill-formed serial numbers
 +      and serial numbers after macro definitions.
 +
 +      Coverage for aclocal diagnosing underquoted macros.
 +      * tests/acloca23.test: New test.
 +      * tests/Makefile.am: Update.
 +
  2010-06-06  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
  
        Prefer AUTOMAKE_fails over `$AUTOMAKE | grep' in tests.