Merge branch 'master' into testsuite-work

* master:
  docs: avoid a footnote, some related rewordings and improvements
  docs: minor cosmetic fixes
  help: improve text about automatically-distributed files
  refactor: split 'usage' subroutine in automake
  tests: fix bug in 'autodist.test'
  maintcheck: extend 'sc_tests_plain_*' checks
  tests: interactions between TESTS_ENVIRONMENT and LOG_COMPILER

diff --cc ChangeLog
index 26e43d3932d7f6814bc9ee4d3a15f5b8296f3a94,3cff620e8acec7655c4a379ab52e41612ef69c99..3c79637c7d2fe18021b4acdcc72dbfea4d4cae5a
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,33 -1,70 +1,100 @@@
+ 2011-06-23   Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       docs: avoid a footnote, some related rewordings and improvements
+       * doc/automake.texi (Dist): Reword the part about automatically
+       distributed files to avoid a footnote.  Since we are at it, extend
+       a bit, and add an example and a reference to a relevant test case.
+ 
+ 2011-06-23   Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       docs: minor cosmetic fixes
+       * doc/automake.texi: Break few overly long lines, throughout the
+       file.
+       ("Simple Tests"): Move @vindex for XFAIL_TESTS to the correct
+       position, i.e., before and not after the paragraph where it is
+       introduced.
+       ("Options" @item ansi2knr): Use @pxref instead of @xref.  This
+       fixes a texinfo warning.
+       ("Other things Automake recognizes" @item AM_C_PROTOTYPES): Use
+       @pxref instead of @ref.
+ 
+ 2011-06-23   Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       help: improve text about automatically-distributed files
+       This change fixes automake bug#7819.
+       * automake.in (usage): Distinguish between files that are always
+       automatically distributed when found, and those which are only
+       "under certain conditions".
+       * doc/automake.texi (Basics of Distribution): Update accordingly.
+       * tests/autodist-subdir.test: Update.
+       * tests/autodist-no-duplicate.test: Likewise.
+       * tests/autodist.test: Likewise.
+       (configure.in): Remove useless call to AM_MAINTAINER_MODE.
+ 
+ 2011-06-23   Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       refactor: split 'usage' subroutine in automake
+       This change is related to automake bug#7819.
+       * automake.in (print_autodist_files): New subroutine,
+       extracted from ...
+       (usage): ... this, which now uses it.
+       * tests/autodist-no-duplicate.test: New test.
+       * tests/Makefile.am (TESTS): Update.
+ 
+ 2011-06-23  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       tests: fix bug in 'autodist.test'
+       * tests/autodist.test: Avoid spurious failure due to no
+       `defs-static' file being found in the parent directory.
+ 
+ 2011-06-21  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       maintcheck: extend 'sc_tests_plain_*' checks
+       * Makefile.am (sc_tests_plain_autom4te): New check.
+       (sc_tests_plain_autoreconf): Likewise.
+       (sc_tests_plain_autoheader): Likewise.
+       (syntax_check_rules): Update.
+ 
+ 2011-06-21  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       tests: interactions between TESTS_ENVIRONMENT and LOG_COMPILER
+       * tests/tests-environment-and-log-compiler.test: New test,
+       checking that we can use variables and functions set by
+       TESTS_ENVIRONMENT and AM_TESTS_ENVIRONMENT in LOG_COMPILER
+       and LOG_FLAGS (for tests both with and without registered
+       extensions).
+       * tests/Makefile.am (TESTS): Update.
+ 
 +2011-06-24  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      tests: make 'subst-no-trailing-empty-line.test' more robust
 +      * tests/subst-no-trailing-empty-line.test: Strengthen existing
 +      checks, to try more scenarios and be slightly stricter in some
 +      grepping checks.
 +
 +2011-06-24  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      tests: fix an incomplete comment
 +      * tests/subst-no-trailing-empty-line.test: Fix an incomplete
 +      comment, and move it to a more proper place.  Minor cosmetic
 +      fixes to other comments.
 +
 +2011-06-20  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      maintcheck: avoid few more spurious failures
 +      * tests/depmod-data.test: Use creative quoting to avoid
 +      spuriously triggering the `sc_tests_Exit_not_exit' maintainer
 +      check.  Commit `v1.11-900-g3453b8e' attempted to fix it, but
 +      succeeded only partially.
 +      * tests/cond33.test: Fix header comments, not to reference
 +      obsolescent make variable `$(mkdir_p)'.
 +      * tests/cond4.test: Rewrite "$MAKE exp=..." as "exp=.. $MAKE -e",
 +      to please `sc_tests_overriding_macros_on_cmdline'
 +      * tests/cond19.test: Likewise.
 +      * tests/cond32.test: Likewise.
 +      * tests/add-missing.test: Use "AUTOMAKE_fails" instead of
 +      "$AUTOMAKE ... && Exit 1", to please `sc_tests_automake_fails'.
 +
  2011-06-20  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        maintcheck: avoid few spurious failures

diff --cc Makefile.am
Simple merge

diff --cc Makefile.in
Simple merge

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/Makefile.in
Simple merge