Merge branch 'master' into testsuite-work

diff --cc ChangeLog
index 2de1e05,cff8707..80b9556
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,20 -1,83 +1,100 @@@
+ 2011-12-16  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       test defs: hack to support autoconf-wrapper programs
+       * tests/defs-static.in ($AUTOCONF): Add a dummy `-B' option to the
+       autoconf invocation, so that, when the Debian autoconf wrapper is
+       involved, it will correctly dispatch an autoconf >= 2.50 instead of
+       defaulting to autoconf 2.13.
+       ($AUTOHEADER, $AUTORECONF): Likewise, but for autoheader and
+       autoreconf respectively.
+       Reported by Bruno Haible:
+       <http://lists.gnu.org/archive/html/automake/2011-12/msg00039.html>
+ 
+ 2011-12-16  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       tests: fix a minor spurious failure with FreeBSD make
+       * tests/remake-am-pr10111.test: Avoid using `#' comments in
+       makefile recipes, as these have been confusing FreeBSD make.
+       The failure was masked by the fact that this test is currently
+       expected to fail.
+       Suggested by a report from Bruno Haible.
+ 
+ 2011-12-16  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       tests: make two test scripts executable
+       * tests/remake-am-pr10111.test: Make executable.
+       * tests/remake-m4-pr10111.test: Likewise.
+ 
+ 2011-12-14  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       readme: reference webpages for automake mailing lists
+       * README: Rationalize and reorganize the (brief) description of
+       the automake mailing lists.   In particular, instead of suggesting
+       the reader to write to the `-request' addresses to subscribe to
+       mailing lists, point him to the relevant webpages, where he can
+       also subscribe via a web form.
+ 
+ 2011-12-14  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       readme: update advice about testsuite execution
+       * README: Now that the automake testsuite uses the parallel-tests
+       driver, there is no need for the user to capture the stdout of
+       "make check" to determine which tests have failed: a detailed log
+       is automatically saved into the `tests/test-suite.log' file.
+       Since we are at it, improve the wording by dropping an extra
+       "please".
+ 
+ 2011-12-14  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       readme: don't reference the old homepage at sources.redhat.com
+       * README: Don't reference the old homepage at sources.redhat.com,
+       which is no longer active; reference the homepage on www.gnu.org
+       instead.  See also automake bug#10157 and bug#10248.
+       * tests/README: Likewise, and remove related extra-pedantic advice
+       about copyright papers for test cases (we'll ask for those papers
+       explicitly when we think they are warranted).
+ 
+ 2011-12-12  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       hacking: some more fixlets
+       * HACKING (Release Procedure): Place the list of pre-release
+       bootstrap-and-test commands on a line of its own, so it's easy to
+       select and then paste it into a terminal window.
+       Fix the explanation of "make git-release", as, since the previous
+       change, "make git-release" would simply run "make dist" rather
+       than "make distcheck".
+       Suggestion from Jim Meyering.
+ 
+ 2011-12-12  Peter Rosin  <peda@lysator.liu.se>
+ 
+       * NEWS: Fix typo in 'make dist-bzip2' description.
+ 
+ 2011-12-10  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       release: don't run "make distcheck" automatically
+       * Makefile.am (git-dist): The developers should test extensively
+       before finally creating the release tarball; so don't run "make
+       distcheck" on their behalf here; instead ...
+       * HACKING (Release procedure): ... state here that "make check"
+       and "make distcheck" should be run before calling "make git-dist".
+ 
 +2011-12-15  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      tests: fix spurious failure in 'color2.test'
 +      * tests/color2.test: (expect-make): Add an "expect eof" directive,
 +      so that the collected output from the spawned make program will be
 +      displayed on stdout, as desired.
 +      Since we are at it, also correctly remove a temporary file which
 +      we was trying to delete using a wrong filename.
 +      Problem introduced in merge `v1.11-1579-g8d3466c', probably by a
 +      botched edit or conflict resolution.
 +
 +2011-12-15  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      tests: fix spurious failure in 'lex3.test'
 +      * tests/lex3.test (foo.l): Remove duplicated definition of
 +      `yywrap'.  Problem introduced in merge `v1.11-1579-g8d3466c'.
 +
  2011-12-09  Jim Meyering  <meyering@redhat.com>
            Stefano Lattarini  <stefano.lattarini@gmail.com>
  

diff --cc Makefile.am
Simple merge

diff --cc Makefile.in
Simple merge

diff --cc NEWS
index 3635dc4,9db43aa..b71e6d4
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -109,15 -37,8 +109,15 @@@ New in 1.11a
    - You may adjust the compression options used in dist-xz and dist-bzip2.
      The default is now merely -e for xz, but still -9 for bzip;  you may
      specify a different level via the XZ_OPT and BZIP2 envvars respectively.
-     E.g., "make dist-xz XZ_OPT=-7" or "make dist-xz BZIP2=-5"
+     E.g., "make dist-xz XZ_OPT=-7" or "make dist-bzip2 BZIP2=-5"
  
 +  - Some auxiliary files that are automatically distributed by Automake
 +    (e.g., `install-sh', or the `depcomp' script for packages compiling
 +    C sources) might now be listed in the DIST_COMMON variable in many
 +    Makefile.in files, rather than in the top-level one.
 +
 +* Miscellaneous changes:
 +
    - Messages of types warning or error from `automake' and `aclocal' are now
      prefixed with the respective type, and presence of -Werror is noted.
  

diff --cc tests/README
Simple merge

diff --cc tests/defs-static.in
index df2fd43,ce8a4cb..af8f501
--- 1/tests/defs-static.in
--- 2/tests/defs-static.in
+++ b/tests/defs-static.in
@@@ -173,15 -111,29 +173,25 @@@ ACLOCAL="$am_original_ACLOCAL -Werror
  # can override this by specifying a different strictness.  Use -Wall
  # -Werror by default.  Tests for which this is inappropriate (e.g. when
  # testing that a warning is enabled by a specific switch) should use
 -# -Wnone or/and -Wno-error.  Tests who want complete control over
 -# automake command-line options should use $original_AUTOMAKE.
 -# Note: the first `test -z' conditional below is to ensure defs-static
 -# really remains idempotent.
 -if test -z "$original_AUTOMAKE"; then
 -  original_AUTOMAKE=${AUTOMAKE-"automake-$APIVERSION"}
 -fi
 -test -z "$AUTOMAKE" && AUTOMAKE="automake-$APIVERSION --foreign -Werror -Wall"
 +# -Wnone or/and -Wno-error.
 +# Tests who want complete control over automake command-line options
 +# should use $am_original_AUTOMAKE instead.
 +AUTOMAKE="$am_original_AUTOMAKE --foreign -Werror -Wall"
  
+ # This is a hack to seamlessly support the infamous "autoconf wrappers",
+ # that might dispatch different autoconf versions depending on the name
+ # of the input files and/or the command-line options used.  See:
+ # <http://lists.gnu.org/archive/html/automake/2011-12/msg00039.html>
+ # FIXME: in the long run, the better fix will be to convert our testsuite
+ # to use `configure.ac' instead of `configure.in' as autoconf input.
+ AUTOCONF="$AUTOCONF -B /no/such/dir"
+ AUTOM4TE="$AUTOM4TE -B /no/such/dir"
+ AUTORECONF="$AUTORECONF -B /no/such/dir"
+ 
  # POSIX no longer requires 'egrep' and 'fgrep',
  # but some hosts lack 'grep -E' and 'grep -F'.
 -EGREP='@EGREP@'
 -FGREP='@FGREP@'
 +EGREP=${AM_TESTSUITE_EGREP-'@EGREP@'}
 +FGREP=${AM_TESTSUITE_FGREP-'@FGREP@'}
  
  # No all versions of Tex support `--version', so we use a configure
  # check to decide if tex is available.  This decision is embodied in