Merge branch 'master' into ng/master

* master:
  tests: rework tests on AM_PATH_PYTHON
  cosmetics: fix typos and references in comments
  typofix: in a test diagnostic
  readme: fixlets to HACKING
  cleanup: remove unused transform '%HAVE-MANS%'
  cleanup: remove stale references to 'lzma' option

diff --cc HACKING
index 03b9dd5288414c7467965f75ffa11f1ea52b4a8b,e2450396a41c72afd9833926c31d3e20d744e514..baa574736b9759cccafa8dba19e05cfd1a39db53
--- 1/HACKING
--- 2/HACKING
+++ b/HACKING
@@@ -38,22 -38,21 +38,22 @@@
  * Changes other than bug fixes must be mentioned in NEWS.  Important
    bug fixes should be mentioned in NEWS, too.
  
- ================================================================
+ ============================================================================
  = Naming
  
 -* We've adopted the convention that internal AC_SUBSTs should be
 -  named with a leading 'am__', and internally generated targets
 -  should be named with a leading 'am--'.  This convention, although
 -  in place from at least February 2001, isn't yet universally used.
 -  But all new code should use it.
 +* Internal make variables and functions should be named following patterns
 +  like 'am.tty-colors' or 'am.dist.files'.
  
 -  We used to use '_am_' as the prefix for an internal AC_SUBST.
 -  However, it turns out that NEWS-OS 4.2R complains if a Makefile
 -  variable begins with the underscore character.  Yay for them.
 -  I changed the target naming convention just to be safe.
 +* Internal AC_SUBSTs should be named with a leading 'am__'.
 +
 +* Private make targets should be named with a leading 'am--'.
 +
 +* WARNING! This convention, introduced recently (since July 2012),
 +  isn't yet universally used.  But all new code should use it,
 +  except in those situation where that would cause spurious
 +  conflicts with mainline Automake.
  
- ================================================================
+ ============================================================================
  = Editing '.am' files
  
  * Always use $(...) and not ${...}

diff --cc automake.in
index 12f2a997d6fb42a939583a2fada040bbf74c67d9,95ecbef3fcc1a098b17018d24ea6b261883647ce..6005424fa4d117e597a7be857c29c02dea276261
--- 1/automake.in
--- 2/automake.in
+++ b/automake.in
@@@ -5660,9 -6789,21 +5660,7 @@@ sub preprocess_file ($%
  
    # Complete %transform with global options.
    # Note that %transform goes last, so it overrides global options.
 -  %transform = ( 'MAINTAINER-MODE'
 -               => $seen_maint_mode ? subst ('MAINTAINER_MODE_TRUE') : '',
 -
 -               'XZ'          => !! option 'dist-xz',
 -               'LZIP'        => !! option 'dist-lzip',
 -               'BZIP2'       => !! option 'dist-bzip2',
 -               'COMPRESS'    => !! option 'dist-tarZ',
 -               'GZIP'        =>  ! option 'no-dist-gzip',
 -               'SHAR'        => !! option 'dist-shar',
 -               'ZIP'         => !! option 'dist-zip',
 -
 -               'INSTALL-INFO' =>  ! option 'no-installinfo',
 -               'INSTALL-MAN'  =>  ! option 'no-installman',
 -               'CK-NEWS'      => !! option 'check-news',
 -
 +  %transform = ( 'INSTALL-MAN'  =>  ! option 'no-installman',
-                'HAVE-MANS'    => !! var ('MANS'),
- 
                 'SUBDIRS'      => !! var ('SUBDIRS'),
                 'TOPDIR_P'     => $relative_dir eq '.',
  

diff --cc doc/automake-ng.texi
Simple merge

diff --cc t/autodist-subdir.sh
Simple merge

diff --cc t/autodist.sh
Simple merge

diff --cc t/auxdir6.sh
Simple merge

diff --cc t/auxdir7.sh
Simple merge

diff --cc t/auxdir8.sh
index 1e42ebb01fc7bd3ef08645a74a05aeac003e6050,c4043293c3374ffcaa0038ab76321bf42ef6706a..8f94275fb62a636e2773745ae0c2af28f55a7376
--- 1/t/auxdir8.sh
--- 2/t/auxdir8.sh
+++ b/t/auxdir8.sh
@@@ -17,9 -17,9 +17,9 @@@
  # Test to make sure AC_CONFIG_AUX_DIR works correctly.
  # This test tries without an explicit call to AC_CONFIG_AUX_DIR;
  # the config auxdir should be implicitly defined to '.' since
 -# the install-sh, mkinstalldirs, etc., scripts are in the top-level
 +# the install-sh, py-compile, etc., scripts are in the top-level
  # directory.
- # Keep this in sync with sister tests auxdir6.test and auxdir7.test.
+ # Keep this in sync with sister tests 'auxdir6.sh' and 'auxdir7.sh'.
  
  . ./defs || exit 1
  

diff --cc t/color-tests.sh
Simple merge

diff --cc t/color-tests2.sh
Simple merge

diff --cc t/confh8.sh
Simple merge

diff --cc t/depcomp8a.sh
Simple merge

diff --cc t/depcomp8b.sh
Simple merge

diff --cc t/dist-missing-included-m4.sh
Simple merge

diff --cc t/dist-missing-m4.sh
Simple merge

diff --cc t/distcom4.sh
Simple merge

diff --cc t/distcom5.sh
Simple merge

diff --cc t/extra10.sh
index 808d3dda266d1911497b9b20092d7dfbb2e4fccd,db34e111726ad6f0e05fd24de2b5861f56845223..f12b076b21f232a1d229d10150c31eecff21c801
--- 1/t/extra10.sh
--- 2/t/extra10.sh
+++ b/t/extra10.sh
@@@ -16,9 -16,10 +16,9 @@@
  
  # Check that wildcards in EXTRA_DIST are honoured.
  # Suggested by observations from Braden McDaniel.
- # See also sister test 'extra11.test', that check a similar usage
+ # See also sister test 'extra11.sh', that checks a similar usage
  # with the involvement of the $(wildcard) GNU make builtin.
  
 -required=GNUmake
  . ./defs || exit 1
  
  echo AC_OUTPUT >> configure.ac

diff --cc t/fort2.sh
index 4ec207c61079d024546bb5f630fc68fa8bf1d69c,fbe05b761870d6eb177e9836b714d9ad5476fc2a..6afa5032d6b386468a330963dcedce2fa6ae59ac
--- 1/t/fort2.sh
--- 2/t/fort2.sh
+++ b/t/fort2.sh
@@@ -17,9 -17,8 +17,9 @@@
  # Test that AC_FC_SRCEXT(f9x) works as intended:
  # - $(FCFLAGS_f) will be used
  
- # Cf. fort1.test and link_f90_only.test.
+ # Cf. 'fort1.sh' and 'link_f90_only.sh'.
  
 +required=gfortran # Required only in order to run ./configure.
  . ./defs || exit 1
  
  mkdir sub

diff --cc t/gnits2.sh
Simple merge

diff --cc t/instdir.sh
Simple merge

diff --cc t/instdir2.sh
Simple merge

diff --cc t/instmany-mans.sh
Simple merge

diff --cc t/instmany-python.sh
Simple merge

diff --cc t/java-compile-run-flat.sh
Simple merge

diff --cc t/java-compile-run-nested.sh
Simple merge

diff --cc t/lex-line.sh
index fc7ce17eccd4352161b3bc74062921fbb1b6173c,11f40b8e8701bda44257275a17b8da9054102ec8..fbc05a578a764415d9b995ffa6831cb52b4d0939
--- 1/t/lex-line.sh
--- 2/t/lex-line.sh
+++ b/t/lex-line.sh
@@@ -15,9 -15,9 +15,9 @@@
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
  # Check that automake lex support ensures that lex-generated C
 -# files use correct "#line" directives.  Try also with the
 +# files use correct "#line" directives.
  # 'subdir-object' option enabled.
- # See also sister test 'yacc-line.test'.
+ # See also sister test 'yacc-line.sh'.
  
  required='cc lex'
  . ./defs || exit 1

diff --cc t/lex-nodist.sh
index c04d613b6665adb4b5f09b0acd8cc0c3af954d4d,0bbb6cbe4a2239a50b4bef4e3990d60609b781f2..19e5968a665943692cff649a8b7148ca44c8130f
--- 1/t/lex-nodist.sh
--- 2/t/lex-nodist.sh
+++ b/t/lex-nodist.sh
@@@ -15,8 -15,10 +15,8 @@@
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
  # Checks for .c files derived from non-distributed .l sources.
- # The test 'yacc-nodist.test' does similar checks for yacc-generated
 -# The test 'lex-pr204.sh' does similar check with AM_MAINTAINER_MODE
 -# enabled.
 -# The tests 'yacc-nodist.sh' and 'yacc-pr204.sh' does similar checks
 -# for yacc-generated .c and .h files.
++# The test 'yacc-nodist.sh' does similar checks for yacc-generated
 +# .c and .h files.
  
  required='cc lex'
  . ./defs || exit 1

diff --cc t/lflags.sh
Simple merge

diff --cc t/lflags2.sh
Simple merge

diff --cc t/libtool3.sh
Simple merge

diff --cc t/libtool9.sh
Simple merge

diff --cc t/parallel-tests-fd-redirect-exeext.sh
Simple merge

diff --cc t/parallel-tests-fd-redirect.sh
Simple merge

diff --cc t/parallel-tests-log-compiler-1.sh
Simple merge

diff --cc t/parallel-tests-suffix-prog.sh
Simple merge

diff --cc t/parallel-tests6.sh
index 018964ae0d9f6d15dc0ee7259a36ecb4c99c0f3f,b0fc34a00d35ac81c25ad3ade1ea28646a4b76c9..31d3125eefa1eee351c0ebbd3b73478b4e2fa03a
--- 1/t/parallel-tests6.sh
--- 2/t/parallel-tests6.sh
+++ b/t/parallel-tests6.sh
@@@ -16,13 -16,17 +16,13 @@@
  
  # Check parallel-tests features:
  # - empty TESTS
- # See parallel-tests10.test for a similar issue.
 -# BSD make will expand '$(TESTS:=.log)' to '.log' unless overridden.
+ # See 'parallel-tests10.sh' for a similar issue.
  
  . ./defs || exit 1
 -cat >> configure.ac << 'END'
 -AC_OUTPUT
 -END
  
 -cat > Makefile.am << 'END'
 -TESTS =
 -END
 +echo AC_OUTPUT >> configure.ac
 +
 +echo TESTS = > Makefile.am
  
  $ACLOCAL
  $AUTOCONF

diff --cc t/posixsubst-libraries.sh
Simple merge

diff --cc t/posixsubst-ltlibraries.sh
Simple merge

diff --cc t/pr401.sh
Simple merge

diff --cc t/pr401b.sh
Simple merge

diff --cc t/pr401c.sh
Simple merge

diff --cc t/primary-prefix-couples-force-valid.sh
Simple merge

diff --cc t/primary-prefix-valid-couples.sh
Simple merge

diff --cc t/remake-deleted-m4-file.sh
Simple merge

diff --cc t/remake-renamed-m4-macro-and-file.sh
Simple merge

diff --cc t/remake-subdir-from-subdir.sh
Simple merge

diff --cc t/remake-subdir-gnu.sh
index a2ead759c7db9df1d5f61dbac43c1a7b6f6efbfc,9b2672bec5ce25a89a509d934cee7d5599232751..b216b0eef3050c0315a0cf622968dbce2a8c0434
--- 1/t/remake-subdir-gnu.sh
--- 2/t/remake-subdir-gnu.sh
+++ b/t/remake-subdir-gnu.sh
@@@ -17,9 -17,10 +17,9 @@@
  # Check that remake rules works from subdirectories, even using
  # 'GNUmakefile' as makefiles name.  This obviously requires GNU
  # make.
- # See also the other similar tests 'remake-subdir*.test', and the
- # related test 'aclocal5.test'
+ # See also the other similar tests 'remake-subdir*.sh', and the
+ # related test 'aclocal5.sh'
  
 -required=GNUmake
  . ./defs || exit 1
  
  magic1='::MagicString::One::'

diff --cc t/remake-subdir.sh
Simple merge

diff --cc t/remake.sh
Simple merge

diff --cc t/remake10a.sh
Simple merge

diff --cc t/remake10b.sh
Simple merge

diff --cc t/remake10c.sh
Simple merge

diff --cc t/remake8a.sh
Simple merge

diff --cc t/remake8b.sh
Simple merge

diff --cc t/remake9a.sh
Simple merge

diff --cc t/remake9b.sh
Simple merge

diff --cc t/remake9c.sh
Simple merge

diff --cc t/remake9d.sh
Simple merge

diff --cc t/silent-many-gcc.sh
Simple merge

diff --cc t/silent-many-generic.sh
Simple merge

diff --cc t/silent-yacc.sh
Simple merge

diff --cc t/silent.sh
Simple merge

diff --cc t/silent2.sh
Simple merge

diff --cc t/silent3.sh
Simple merge

diff --cc t/silent4.sh
Simple merge

diff --cc t/silent9.sh
Simple merge

diff --cc t/silentcxx-gcc.sh
Simple merge

diff --cc t/silentcxx.sh
index be24509ba643c98605b5dfc42ac8fccea87e0dff,fe4c9d4a92f43887b84cf0e7ffbb01bf6b8544c4..20dbd2b8085969db0c17649ecaeec85e359656ca
--- 1/t/silentcxx.sh
--- 2/t/silentcxx.sh
+++ b/t/silentcxx.sh
@@@ -14,8 -14,9 +14,8 @@@
  # You should have received a copy of the GNU General Public License
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
 -# Check silent-rules mode for C++.
  # This test should work with generic C++ compilers; keep it in sync with
- # sister test 'silentcxx-gcc.test', which requires the GNU C++ compiler
+ # sister test 'silentcxx-gcc.sh', which requires the GNU C++ compiler
  # and forces the use of gcc depmode.
  
  required=c++

diff --cc t/silentf77.sh
Simple merge

diff --cc t/silentf90.sh
Simple merge

diff --cc t/subobj11a.sh
index 25603cef6e1b9a814925e1ad224a32b498dbe50a,25bdb93d1e6cb7a89e1458568a195105daeb7bf7..615ed6300afafd328ae5f5def86be406acc9dc1d
--- 1/t/subobj11a.sh
--- 2/t/subobj11a.sh
+++ b/t/subobj11a.sh
@@@ -14,22 -14,17 +14,21 @@@
  # You should have received a copy of the GNU General Public License
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
 -# Test that automake works around a bug of Solaris Make. The bug is the
 -# following.  If we have a Makefile containg a file inclusion like this:
 +# If we have a Makefile containing a file inclusion like this:
 +#
  #   include .//foo.mk
 -# Solaris make fails with a message like:
 +#
 +# Solaris 10 make fails with a message like:
 +#
  #   make: ... can't find '/foo.mk': No such file or directory
  #   make: fatal error ... read of include file '/foo.mk' failed
 -# (even if the file 'foo.mk' exists). The error disappear by collapsing
 -# the repeated slash '/' characters into a single one.
  #
 -# See also sister "grepping" test 'subobj11b.sh', and related test
 -# 'subobj11c.sh'.
 +# (even if the file 'foo.mk' exists).  Our dependency tracking support
 +# code used to generate include directives like that sometimes, thus
 +# causing spurious failures.
 +#
 +# GNU make shouldn't suffer from that Solaris make bug, but we check
 +# the problematic setup anyway -- better safe than sorry.
- #
  
  required=cc
  . ./defs || exit 1

diff --cc t/suffix.sh
index eecf9a415fa59a0a69e1157ad33a7c303d0c2e67,cf7ea1050454cdce432e8d7b50a538ec47a80e0d..1d4ca48671d9b2af812eb2ce7664103b434e514d
--- 1/t/suffix.sh
--- 2/t/suffix.sh
+++ b/t/suffix.sh
@@@ -14,9 -14,9 +14,9 @@@
  # You should have received a copy of the GNU General Public License
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
 -# Make sure proper suffix rules for C compilation are produced, and
 +# Make sure proper pattern rules for C compilation are produced, and
  # only once.
- # See also related test 'suffix2.test'.
+ # See also related test 'suffix2.sh'.
  
  . ./defs || exit 1
  

diff --cc t/suffix2.sh
index 98d05e66ab1c4d5cde9c1459170d00d4806792b8,1cee875344fe8f9d55595cd1c1c72edf32375fb6..802775466a6262f3129ed5eccaaac7f8fc6fbfec
--- 1/t/suffix2.sh
--- 2/t/suffix2.sh
+++ b/t/suffix2.sh
@@@ -14,9 -14,10 +14,9 @@@
  # You should have received a copy of the GNU General Public License
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
 -# Make sure proper suffix rules for C compilation are produced,
 +# Make sure proper pattern rules for C compilation are produced,
  # and only once, even for libtool libraries.
- # See also related test 'suffix.test'.
+ # See also related test 'suffix.sh'.
 -required=libtoolize
  
  . ./defs || exit 1
  

diff --cc t/tap-log.sh
Simple merge

diff --cc t/tap-passthrough-exit.sh
Simple merge

diff --cc t/tap-passthrough.sh
Simple merge

diff --cc t/tap-recheck.sh
Simple merge

diff --cc t/test-driver-custom-multitest-recheck.sh
Simple merge

diff --cc t/test-driver-custom-multitest-recheck2.sh
index a622c237f0908cc3d4a59619dbbb696708dc3a17,7f20b814eb282d5bee2e75c013662ef2758a9616..d8de857dd9f1bd1c4fec3c3cce3e7fb133ccaa92
--- 1/t/test-driver-custom-multitest-recheck2.sh
--- 2/t/test-driver-custom-multitest-recheck2.sh
+++ b/t/test-driver-custom-multitest-recheck2.sh
@@@ -16,8 -16,10 +16,8 @@@
  
  # Custom test drivers: try the "recheck" functionality with test protocols
  # that allow multiple testcases in a single test script.  In particular,
 -# check that this still works when we override $(TESTS) and $(TEST_LOGS)
 -# at make runtime.
 -# See also related tests 'test-driver-custom-multitest-recheck.sh' and
 -# 'parallel-tests-recheck-override.sh'.
 +# check that this still works when we override $(TESTS) at make runtime.
- # See also related tests 'test-driver-custom-multitest-recheck.test'.
++# See also related tests 'test-driver-custom-multitest-recheck.sh'.
  
  . ./defs || exit 1
  

diff --cc t/test-log.sh
Simple merge

diff --cc t/vtexi3.sh
Simple merge

diff --cc t/vtexi4.sh
Simple merge

diff --cc t/yacc-basic.sh
Simple merge

diff --cc t/yacc-cxx.sh
Simple merge

diff --cc t/yacc-d-basic.sh
Simple merge

diff --cc t/yacc-d-cxx.sh
Simple merge

diff --cc t/yacc-line.sh
index fab905ef9bfd127c8f4634ef7f2e46cf3e93a2b3,525a455b24ebc4361ba15eb6fab58ab06fbb8a89..f7626b0a9a7fd43bd86331c7ccba69bd0df8f85d
--- 1/t/yacc-line.sh
--- 2/t/yacc-line.sh
+++ b/t/yacc-line.sh
@@@ -14,9 -14,10 +14,9 @@@
  # You should have received a copy of the GNU General Public License
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
--# Check that automake yacc support ensures that yacc-generated C
- # files use correct "#line" directives.
- # See also sister test 'lex-line.test'.
 -# files use correct "#line" directives.  Try also with the
 -# 'subdir-object' option enabled.
++# Check that automake yacc support ensures that yacc-generated
++# C files use correct "#line" directives.
+ # See also sister test 'lex-line.sh'.
  
  required='cc yacc'
  . ./defs || exit 1

diff --cc t/yacc-nodist.sh
index 4209ec1a7d1d857980612ef8d732dc1fc993300c,2e9c7e86b55d156e03344b0e5519894240904f90..1be007c188794c66ea7547746fc3e7a49f211f8a
--- 1/t/yacc-nodist.sh
--- 2/t/yacc-nodist.sh
+++ b/t/yacc-nodist.sh
@@@ -15,8 -15,10 +15,7 @@@
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
  # Checks for .c and .h files derived from non-distributed yacc sources.
- # The test 'lex-nodist.test' does similar checks for lex-generated .c
- # files.
 -# The test 'yacc-pr204.sh' does similar check with AM_MAINTAINER_MODE
 -# enabled.
 -# The tests 'lex-nodist.sh' and 'lex-pr204.sh' does similar checks
 -# for lex-generated .c files.
++# The test 'lex-sh.test' does similar checks for lex-generated '.c'
  
  required='cc yacc'
  . ./defs || exit 1

diff --cc t/yflags.sh
Simple merge

diff --cc t/yflags2.sh
Simple merge