Merge branch 'master' into testsuite-work

* master:
  maintcheck: fix some more failures
  maintcheck: fix some failures, extend some checks

diff --cc ChangeLog
index 04df5264ecc67dbf22689c35f37b35bd89da9a89,b10c28acc57314da9a0df26765a4896652bebd42..98dc3054e6167e0180bab81070ffbdb873fcb468
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,35 -1,34 +1,66 @@@
+ 2011-06-02  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       maintcheck: fix some more failures
+       * tests/instdir-ltlib.test: Use creative quoting to avoid
+       spuriously triggering the `sc_rm_minus_f' maintainer check.
+       * tests/instdir-prog.test: Likewise.
+       * tests/instspc-data.test: Use creative quoting to avoid
+       spuriously triggering the `sc_tests_Exit_not_exit' maintainer
+       check.
+ 
+ 2011-06-02  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       maintcheck: fix some failures, extend some checks
+       * Makefile.am (sc_diff_automake_in_automake): Update, as we
+       now expect 9 lines, not 8, to be changed from `automake.in'
+       to `automake'.
+       (sc_diff_aclocal_in_aclocal): New maintainer check, similar to
+       the above, and checking that only 10 lines are changed from
+       `aclocal.in' to `aclocal'.
+       (syntax_check_rules): Update.
+       (sc_tests_Exit_not_exit): Exempt self tests `self-check-*.test'
+       from this check, as they can legitimately use the bare `exit'
+       builtin in various places.
+       * doc/automake.texi (Python): Remove stray `@' from the end of
+       a line.  Typo introduced in commit `v1.11-312-g5bf7af6'.
+       * tests/depcomp8a.test: Pass DISTCHECK_CONFIGURE_FLAGS to make
+       from the environment rather than from the command line, to
+       pacify the `sc_tests_overriding_macros_on_cmdline' maintainer
+       check.
+       * tests/depcomp8b.test: Likewise.
+ 
 +2011-06-02  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      tests: don't require GNU make where it's not strictly needed
 +      * tests/autohdr3.test: Rewrite to be stricter when make is GNU
 +      make.  Drop the requirement of GNU make.
 +      * tests/aclocal5.test: Drop GNU make requirement, it's not truly
 +      needed.  Add reference to similar tests `remake-subdir*.test'.
 +      * remake-subdir-gnu.test, remake-subdir-from-subdir.test,
 +      remake-subdir.test, remake-subdir2.test: Add reference to
 +      each other, and to related test `aclocal5.test'.
 +      * tests/aclocal6.test: Drop GNU make requirement, it's not
 +      truly needed.
 +      * tests/confh6.test: Likewise.
 +      * tests/lex3.test: Likewise.
 +      * tests/remake11.test: Likewise.
 +      * tests/subdir5.test: Likewise.
 +      * tests/subdir8.test: Likewise.
 +      * tests/werror2.test: Likewise.
 +      * tests/conff.test: Likewise, and ensure verbose printing of
 +      captured make output.
 +      * tests/lex5.test: Tweak so that GNU make is no more required.
 +      * tests/version7.test: Likewise.
 +      * tests/maken2.test: Add explicative comment for why this test
 +      requires GNU make.
 +      * tests/maken4.test: Let it run also with BSD makes supporting
 +      the `.MAKE' special target.
 +      * tests/output6.test: Use proper m4 quoting in configure.in.
 +      Expand make macros with one-character name using `$(x)', not
 +      `$x', for portability.  Move checks in the makefiles, rather
 +      than relying on grepping the output from make.  Drop the now
 +      unneeded GNU make requirement.
 +
  2011-05-29  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        remake: behave better with non-GNU make in subdirectories

diff --cc Makefile.am
Simple merge

diff --cc Makefile.in
Simple merge

diff --cc tests/depcomp8a.test
index 9866cfdc2bfb940d6fa8b4238ee00a716fb6e04a,5591f0070630097945a487266f6713dbad69b13e..5b2030499d37181fbcf22b6c7ea523fad00c33c4
--- 1/tests/depcomp8a.test
--- 2/tests/depcomp8a.test
+++ b/tests/depcomp8a.test
@@@ -55,8 -54,8 +55,8 @@@ $AUTOCON
  # Don't reject slower dependency extractors, for better coverage.
  ./configure --enable-dependency-tracking
  $MAKE
 -./zardoz
 +cross_compiling || ./zardoz
- $MAKE DISTCHECK_CONFIGURE_FLAGS='--enable-dependency-tracking' distcheck
+ DISTCHECK_CONFIGURE_FLAGS='--enable-dependency-tracking' $MAKE distcheck
  
  # Try again with subdir-objects option.
  
@@@ -74,7 -73,7 +74,7 @@@ $AUTOCON
  # Don't reject slower dependency extractors, for better coverage.
  ./configure --enable-dependency-tracking
  $MAKE
 -./zardoz
 +cross_compiling || ./zardoz
- $MAKE DISTCHECK_CONFIGURE_FLAGS='--enable-dependency-tracking' distcheck
+ DISTCHECK_CONFIGURE_FLAGS='--enable-dependency-tracking' $MAKE distcheck
  
  :

diff --cc tests/depcomp8b.test
Simple merge

diff --cc tests/instdir-ltlib.test
Simple merge

diff --cc tests/instdir-prog.test
Simple merge

diff --cc tests/instspc-data.test
index 54f796c1ccc4e3cde751f9e8c51150eaa9c6de1a,9af473a8b012e83e1251ff32b277b02d0b604bda..7b222ff3a3b550fce8f58739647932374ce310f1
--- 1/tests/instspc-data.test
--- 2/tests/instspc-data.test
+++ b/tests/instspc-data.test
@@@ -14,16 -14,14 +14,18 @@@
  # You should have received a copy of the GNU General Public License
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
 -# Helper testcase which generate input data for the other test
 -# `instspc-*.test'.  It basically delegates the work to the helper
 -# script `instspc-test.sh'.
 +# Helper testcase which generate input data for the `*.instspc' tests.
 +# It basically delegates the work to the driver script `instspc-test.sh'.
  
  # Ensure proper definition of $testsrcdir.
- . ./defs-static || exit 99
+ # FIXME: we employ useless quoting below to please maintainer-check.
+ . ./defs-static || 'exit' 99
 -test -n "$testsrcdir" || 'exit' 99 # Sanity check.
  
 -instspc_action=generate-data
 -. $testsrcdir/instspc-tests.sh
 +# Sanity check.
 +if test x"$testsrcdir" = x; then
 +  echo "$0: \$testsrcdir not set after sourcing of ./defs-static" >&2
-   exit 99
++  # FIXME: we employ useless quoting below to please maintainer-check.
++  'exit' 99
 +fi
 +
 +exec $SHELL $testsrcdir/instspc-tests.sh --generate-data