Merge branch 'maint'

diff --cc ChangeLog
index c062875f943079841c677416c270dbf942ddbc8a,869d685ea288e3903e92415b291063fa866e0c65..cb4b3af2eda0bba025eec04f7012cfcce3559c5f
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,52 -1,17 +1,66 @@@
+ 2011-01-10   Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       tests: add checks on automatically-distributed files
+       Related to automake bug#7819.
+       * tests/autodist.test: New test.
+       * tests/autodist-subdir.test: Likewise.
+       * tests/autodist-acconfig.test: Likewise.
+       * tests/autodist-acconfig-no-subdir.test: Likewise.
+       * tests/autodist-aclocal-m4.test: Likewise.
+       * tests/autodist-config-headers.test: Likewise.
+       * tests/autodist-configure-no-subdir.test: Likewise.
+       * tests/autodist-stamp-vti.test: Likewise.
+       * tests/Makefile.am (TESTS): Update.
+ 
 +2011-01-11  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      tests: do not force yacc-requiring tests to use bison
 +      * tests/defs.in: New required entry 'yacc'.  Remove old
 +      required entry 'bison'.
 +      * tests/cond35.test ($required): Require yacc, not bison.
 +      * tests/cond36.test: Likewise.
 +      * tests/pr204.test: Likewise.
 +      * tests/silent-many-gcc.test: Likewise.
 +      * tests/silent-many-generic.test: Likewise.
 +      * tests/silent-yacc-gcc.test: Likewise.
 +      * tests/silent-yacc-generic.test: Likewise.
 +      * tests/subpkg.test: Likewise.
 +      * tests/suffix10.test: Likewise.
 +      * tests/yacc-basic.test: Likewise.
 +      * tests/yacc-clean.test: Likewise.
 +      * tests/yacc-d-basic.test: Likewise.
 +      * tests/yacc-d-vpath.test: Likewise.
 +      * tests/yacc-dist-nobuild.test: Likewise.
 +      * tests/yacc-nodist.test: Likewise.
 +      * tests/yacc4.test: Likewise.
 +      * tests/yacc6.test: Likewise.
 +      * tests/yacc7.test: Likewise.
 +      * tests/yacc8.test: Likewise.
 +      * tests/yaccdry.test: Likewise.
 +      * tests/yaccvpath.test: Likewise.
 +
 +2011-01-11  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      tests: more consistent checks about invalid options
 +      * tests/aclocal.test: Grepping of automake stderr for messages
 +      reporting invalid options made stricter.
 +      * tests/no-outdir-option.test: Likewise.  Also, create a dummy
 +      `Makefile.am', to ensure that the automake failures are really
 +      caused only by unrecognized options.
 +      * tests/automake.test: Added trailing `:' command.  Removed
 +      redundant checks on `--help' and `--version' option (already
 +      performed in the test `help*.test').
 +
 +2011-01-11   Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      tests: enable 'errexit' shell flag by default.
 +      * tests/defs: Enable `errexit' shell flag (near the end).
 +      Removed redundant comment about the enabling of shell traces.
 +      * tests/README (Writing test cases): Update, and use nicer
 +      formatting in a couple of places.
 +      * All tests: Adjusted by removing now-redundant calls to
 +      'set -e'.
 +
  2011-01-11  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        tests: work around a texi+cygnus bug causing a spurious XFAIL

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/Makefile.in
Simple merge