Merge branch 'am-tests-setup'

diff --cc ChangeLog
index e5caf81,ed1d4aa..a7541e8
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,29 +1,29 @@@
  2011-04-17  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
+       check: new developer-reserved AM_TESTS_SETUP variable
+       For reference, see the discussion at:
+       <http://lists.gnu.org/archive/html/automake-patches/2011-01/msg00213.html>
+       * lib/am/check.am [%?PARALLEL_TESTS%] (am__check_pre): Pass also
+       $(AM_TESTS_SETUP).  Comments updated, and some typos fixed.
+       * doc/automake.texi (Simple Tests using parallel-tests): Document
+       AM_TESTS_SETUP.  Reorder some of the existing documentation a bit.
+       * tests/parallel-tests-am_tests_setup.test: New test.
+       From a suggestion by Ralf Wildenhues.
+ 
+ 2011-04-17  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       depcomp tests: don't reject slower dependency extractors
+       * tests/depcomp8b.test: Add the `--enable-dependency-tracking'
+       option to `configure' invocations, so that slower dependency
+       extractors are not rejected.
+       * tests/depcomp8b.test: Likewise.  Also ...
+       (foo.c): ... since we are at it, fix spacing to be consistent
+       with GNU coding standards.
+ 
+ 2011-04-17  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
        m4: add missing serial numbers to a few files
 -      Related to automake bug#8483.
 +      Fixes automake bug#8483.
        * m4/amversion.in: Add serial number.
        * m4/auxdir.m4: Likewise.
        * m4/gcj.m4: Likewise.

diff --cc doc/automake.texi
Simple merge

diff --cc lib/Automake/tests/Makefile.in
Simple merge

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/Makefile.in
Simple merge

diff --cc tests/depcomp8a.test
Simple merge

diff --cc tests/depcomp8b.test
Simple merge