Merge branch 'master' into ng/master

* master:
  tests: fix a spurious failure on NetBSD 5.1
  texi: build version.texi and stamp-vti in srcdir
  tests: fix a botched heading comment
  tests: fix another spurious with FreeBSD make
  tests: fix a spurious failure with FreeBSD make
  tests: fix a spurious failure with FreeBSD make
  lisp: fix a failure with Solaris /usr/xpg4/bin/sh
  tests: sanitize 'unset' usages
  tests: fix some botched/outdated comments
  tests: use perl, not find+rm, to remove temporary directories
  depend: reduce code duplication, de-uglify make verbose output
  tests: remove remaining exec bits ('master' branch)
  tests: remove remaining exec bits ('maint' branch)
  tests: remove exec bit from all of them ('micro' branch)
  maint: tests no longer need to have executable bit set
  PLANS: subdir-objects: various updates
  depend: prefer $(...) over `...` in Cygwin-specific recipes
  depend: reduce code duplication
  depend: a preparatory refactoring
  depend: refactor and remove code duplication
  Automake::Language: drop unused fields 'compile_flag' and 'output_flag'
  depend: assume '-c' compiler flag always means to produce object files
  depend: assume we can always pass '-o' to the C compiler
  cleanup: having subdir-objects mandatory allow us some simplifications
  subdir-objects: enable unconditionally

+ Non-trivial extra changes (excerpt):

* bin/automake.in: remove few remaining subroutine prototypes.
* lib/am/depend2.am: Drop uses of '%-o%' and '%-c%' transforms;
just assume they expand to '-o' and '-c' unconditionally.  Be
sure to always use a space after the '%SOURCEFLAG%' transform.
Drop obsolete comments.
* t/: Make those *.sh and *.tap tests that are only present for
Automake-NG and not mainline Automake non-executable (as it has
already been done for the tests in mainline Automake).

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

1211 files changed, 115 insertions, 88 deletions

diff --git a/t/Makefile.inc b/t/Makefile.inc
index 0fe591e26..f43efd6b9 100644
--- a/t/Makefile.inc
+++ b/t/Makefile.inc
@@ -32,7 +32,8 @@ TAP_LOG_DRIVER = AM_TAP_AWK='$(AWK)' $(SHELL) $(srcdir)/lib/tap-driver.sh
 
 AM_TAP_LOG_DRIVER_FLAGS = --merge
 
-EXTRA_DIST += %D%/README %D%/ax/is %D%/ax/is_newest
+EXTRA_DIST += %D%/README %D%/ax/is %D%/ax/is_newest %D%/ax/deltree.pl
+ 
 
 # Hand-written tests for stuff in 'contrib/'.
 include $(srcdir)/contrib/%D%/Makefile.inc
@@ -292,15 +293,6 @@ EXTRA_DIST += $(perf_TESTS)
 clean-local: clean-local-check
 .PHONY: clean-local-check
 clean-local-check:
-## Directories candidate to be test directories match this wildcard.
-	@globs='%D%/*.dir %D%/*/*.dir */%D%/*.dir */%D%/*/*.dir'; \
-## The 'nullglob' bash option is not portable, so use perl.
-	dirs=`$(PERL) -e "print join(' ', glob('$$globs'));"` || exit 1; \
-	if test -n "$$dirs"; then \
-## Errors in find are acceptable, errors in rm are not.
-	    find $$dirs -type d ! -perm -700 -exec chmod u+rwx {} ';'; \
-	    echo " rm -rf $$dirs"; \
-	    rm -rf $$dirs || exit 1; \
-	fi
+	$(AM_V_GEN)$(PERL) $(srcdir)/t/ax/deltree.pl t/*.dir t/*/*.dir */t/*.dir
 
 # vim: ft=automake noet
diff --git a/t/README b/t/README
index b4e1490c7..f9c7f0780 100644
--- a/t/README
+++ b/t/README
@@ -258,10 +258,6 @@ Writing test cases
   by a C++ compiler, for similar reasons (i.e., the isatty(3) function
   from that same unistd.h header would be required otherwise).
 
-* Before commit: make sure the test is executable, add the tests to
-  TESTS in Makefile.am, add it to XFAIL_TESTS in addition if needed,
-  write a ChangeLog entry, send the diff to <automake-ng@gnu.org>.
-
 * In test scripts, prefer using POSIX constructs over their old
   Bourne-only equivalents:
 
diff --git a/t/ac-output-old.tap b/t/ac-output-old.tap
index 5b2c2310c..5b2c2310c 100755..100644
--- a/t/ac-output-old.tap
+++ b/t/ac-output-old.tap
diff --git a/t/aclocal-I-and-install.sh b/t/aclocal-I-and-install.sh
index 7c1b0d403..7c1b0d403 100755..100644
--- a/t/aclocal-I-and-install.sh
+++ b/t/aclocal-I-and-install.sh
diff --git a/t/aclocal-I-order-1.sh b/t/aclocal-I-order-1.sh
index d9003e030..d9003e030 100755..100644
--- a/t/aclocal-I-order-1.sh
+++ b/t/aclocal-I-order-1.sh
diff --git a/t/aclocal-I-order-2.sh b/t/aclocal-I-order-2.sh
index c3fe00a95..c3fe00a95 100755..100644
--- a/t/aclocal-I-order-2.sh
+++ b/t/aclocal-I-order-2.sh
diff --git a/t/aclocal-I-order-3.sh b/t/aclocal-I-order-3.sh
index 4fcbf4c99..4fcbf4c99 100755..100644
--- a/t/aclocal-I-order-3.sh
+++ b/t/aclocal-I-order-3.sh
diff --git a/t/aclocal-acdir.sh b/t/aclocal-acdir.sh
index e363e670e..e363e670e 100755..100644
--- a/t/aclocal-acdir.sh
+++ b/t/aclocal-acdir.sh
diff --git a/t/aclocal-amflags.sh b/t/aclocal-amflags.sh
index 10f0cb185..10f0cb185 100755..100644
--- a/t/aclocal-amflags.sh
+++ b/t/aclocal-amflags.sh
diff --git a/t/aclocal-autoconf-version-check.sh b/t/aclocal-autoconf-version-check.sh
index 29aee30cc..29aee30cc 100755..100644
--- a/t/aclocal-autoconf-version-check.sh
+++ b/t/aclocal-autoconf-version-check.sh
diff --git a/t/aclocal-comments-respected.sh b/t/aclocal-comments-respected.sh
index ab2a3daea..ab2a3daea 100755..100644
--- a/t/aclocal-comments-respected.sh
+++ b/t/aclocal-comments-respected.sh
diff --git a/t/aclocal-deleted-header-aclocal-amflags.sh b/t/aclocal-deleted-header-aclocal-amflags.sh
index 88c83e59f..88c83e59f 100755..100644
--- a/t/aclocal-deleted-header-aclocal-amflags.sh
+++ b/t/aclocal-deleted-header-aclocal-amflags.sh
diff --git a/t/aclocal-deleted-header.sh b/t/aclocal-deleted-header.sh
index 4d031de4c..4d031de4c 100755..100644
--- a/t/aclocal-deleted-header.sh
+++ b/t/aclocal-deleted-header.sh
diff --git a/t/aclocal-deps-subdir.sh b/t/aclocal-deps-subdir.sh
index f97d3740b..f97d3740b 100755..100644
--- a/t/aclocal-deps-subdir.sh
+++ b/t/aclocal-deps-subdir.sh
diff --git a/t/aclocal-deps.sh b/t/aclocal-deps.sh
index c1c29b64b..c1c29b64b 100755..100644
--- a/t/aclocal-deps.sh
+++ b/t/aclocal-deps.sh
diff --git a/t/aclocal-dirlist-abspath.sh b/t/aclocal-dirlist-abspath.sh
index b3e56458e..b3e56458e 100755..100644
--- a/t/aclocal-dirlist-abspath.sh
+++ b/t/aclocal-dirlist-abspath.sh
diff --git a/t/aclocal-dirlist-globbing.sh b/t/aclocal-dirlist-globbing.sh
index fe372172d..fe372172d 100755..100644
--- a/t/aclocal-dirlist-globbing.sh
+++ b/t/aclocal-dirlist-globbing.sh
diff --git a/t/aclocal-dirlist.sh b/t/aclocal-dirlist.sh
index a97256f72..a97256f72 100755..100644
--- a/t/aclocal-dirlist.sh
+++ b/t/aclocal-dirlist.sh
diff --git a/t/aclocal-install-absdir.sh b/t/aclocal-install-absdir.sh
index 998678f4c..998678f4c 100755..100644
--- a/t/aclocal-install-absdir.sh
+++ b/t/aclocal-install-absdir.sh
diff --git a/t/aclocal-install-fail.sh b/t/aclocal-install-fail.sh
index e67535628..e67535628 100755..100644
--- a/t/aclocal-install-fail.sh
+++ b/t/aclocal-install-fail.sh
diff --git a/t/aclocal-install-mkdir.sh b/t/aclocal-install-mkdir.sh
index 0264598af..0264598af 100755..100644
--- a/t/aclocal-install-mkdir.sh
+++ b/t/aclocal-install-mkdir.sh
diff --git a/t/aclocal-m4-include-are-scanned-aclocal-amflags.sh b/t/aclocal-m4-include-are-scanned-aclocal-amflags.sh
index 233388ce7..233388ce7 100755..100644
--- a/t/aclocal-m4-include-are-scanned-aclocal-amflags.sh
+++ b/t/aclocal-m4-include-are-scanned-aclocal-amflags.sh
diff --git a/t/aclocal-m4-include-are-scanned.sh b/t/aclocal-m4-include-are-scanned.sh
index 8fc34465c..8fc34465c 100755..100644
--- a/t/aclocal-m4-include-are-scanned.sh
+++ b/t/aclocal-m4-include-are-scanned.sh
diff --git a/t/aclocal-m4-sinclude.sh b/t/aclocal-m4-sinclude.sh
index 635c0eaf0..635c0eaf0 100755..100644
--- a/t/aclocal-m4-sinclude.sh
+++ b/t/aclocal-m4-sinclude.sh
diff --git a/t/aclocal-macrodir.tap b/t/aclocal-macrodir.tap
index fb8060968..4d11917b1 100755..100644
--- a/t/aclocal-macrodir.tap
+++ b/t/aclocal-macrodir.tap
@@ -23,7 +23,7 @@ am_create_testdir=empty
 plan_ 7
 
 ocwd=$(pwd) || fatal_ "getting current working directory"
-ACLOCAL_PATH=; unset ACLOCAL_PATH
+unset ACLOCAL_PATH
 
 #
 # General utility functions and variables.
diff --git a/t/aclocal-macrodirs.tap b/t/aclocal-macrodirs.tap
index 0898c29ef..1cbf6d7bc 100755..100644
--- a/t/aclocal-macrodirs.tap
+++ b/t/aclocal-macrodirs.tap
@@ -23,7 +23,7 @@ am_create_testdir=empty
 plan_ 15
 
 ocwd=$(pwd) || fatal_ "getting current working directory"
-ACLOCAL_PATH=; unset ACLOCAL_PATH
+unset ACLOCAL_PATH
 
 #
 # General utility functions and variables.
diff --git a/t/aclocal-missing-macros.sh b/t/aclocal-missing-macros.sh
index f5dded6fb..f5dded6fb 100755..100644
--- a/t/aclocal-missing-macros.sh
+++ b/t/aclocal-missing-macros.sh
diff --git a/t/aclocal-no-extra-scan.sh b/t/aclocal-no-extra-scan.sh
index d39cc67fd..d39cc67fd 100755..100644
--- a/t/aclocal-no-extra-scan.sh
+++ b/t/aclocal-no-extra-scan.sh
diff --git a/t/aclocal-no-force.sh b/t/aclocal-no-force.sh
index 4be3b9ac4..4be3b9ac4 100755..100644
--- a/t/aclocal-no-force.sh
+++ b/t/aclocal-no-force.sh
diff --git a/t/aclocal-no-install-no-mkdir.sh b/t/aclocal-no-install-no-mkdir.sh
index 60b43f9d7..60b43f9d7 100755..100644
--- a/t/aclocal-no-install-no-mkdir.sh
+++ b/t/aclocal-no-install-no-mkdir.sh
diff --git a/t/aclocal-no-symlinked-overwrite.sh b/t/aclocal-no-symlinked-overwrite.sh
index 8da674453..8da674453 100755..100644
--- a/t/aclocal-no-symlinked-overwrite.sh
+++ b/t/aclocal-no-symlinked-overwrite.sh
diff --git a/t/aclocal-no-unused-required.sh b/t/aclocal-no-unused-required.sh
index 29ff8f511..29ff8f511 100755..100644
--- a/t/aclocal-no-unused-required.sh
+++ b/t/aclocal-no-unused-required.sh
diff --git a/t/aclocal-path-install-serial.sh b/t/aclocal-path-install-serial.sh
index b258d1a1f..b258d1a1f 100755..100644
--- a/t/aclocal-path-install-serial.sh
+++ b/t/aclocal-path-install-serial.sh
diff --git a/t/aclocal-path-install.sh b/t/aclocal-path-install.sh
index 970547a2b..970547a2b 100755..100644
--- a/t/aclocal-path-install.sh
+++ b/t/aclocal-path-install.sh
diff --git a/t/aclocal-path-nonexistent.sh b/t/aclocal-path-nonexistent.sh
index 8315816af..8315816af 100755..100644
--- a/t/aclocal-path-nonexistent.sh
+++ b/t/aclocal-path-nonexistent.sh
diff --git a/t/aclocal-path-precedence.sh b/t/aclocal-path-precedence.sh
index a4e9d08d9..a4e9d08d9 100755..100644
--- a/t/aclocal-path-precedence.sh
+++ b/t/aclocal-path-precedence.sh
diff --git a/t/aclocal-path.sh b/t/aclocal-path.sh
index d5383968b..d5383968b 100755..100644
--- a/t/aclocal-path.sh
+++ b/t/aclocal-path.sh
diff --git a/t/aclocal-pr450.sh b/t/aclocal-pr450.sh
index 184cc335c..184cc335c 100755..100644
--- a/t/aclocal-pr450.sh
+++ b/t/aclocal-pr450.sh
diff --git a/t/aclocal-print-acdir.sh b/t/aclocal-print-acdir.sh
index 86b0fc492..86b0fc492 100755..100644
--- a/t/aclocal-print-acdir.sh
+++ b/t/aclocal-print-acdir.sh
diff --git a/t/aclocal-remake-misc.sh b/t/aclocal-remake-misc.sh
index 3406928d8..3406928d8 100755..100644
--- a/t/aclocal-remake-misc.sh
+++ b/t/aclocal-remake-misc.sh
diff --git a/t/aclocal-req.sh b/t/aclocal-req.sh
index a0d17dd66..a0d17dd66 100755..100644
--- a/t/aclocal-req.sh
+++ b/t/aclocal-req.sh
diff --git a/t/aclocal-scan-configure-ac-pr319.sh b/t/aclocal-scan-configure-ac-pr319.sh
index 9d11d0f16..9d11d0f16 100755..100644
--- a/t/aclocal-scan-configure-ac-pr319.sh
+++ b/t/aclocal-scan-configure-ac-pr319.sh
diff --git a/t/aclocal-serial.sh b/t/aclocal-serial.sh
index dd35d2a65..dd35d2a65 100755..100644
--- a/t/aclocal-serial.sh
+++ b/t/aclocal-serial.sh
diff --git a/t/aclocal-underquoted-defun.sh b/t/aclocal-underquoted-defun.sh
index 7753db966..7753db966 100755..100644
--- a/t/aclocal-underquoted-defun.sh
+++ b/t/aclocal-underquoted-defun.sh
diff --git a/t/aclocal-verbose-install.sh b/t/aclocal-verbose-install.sh
index 3a0afcbf8..3a0afcbf8 100755..100644
--- a/t/aclocal-verbose-install.sh
+++ b/t/aclocal-verbose-install.sh
diff --git a/t/aclocal.sh b/t/aclocal.sh
index f2983457a..f2983457a 100755..100644
--- a/t/aclocal.sh
+++ b/t/aclocal.sh
diff --git a/t/acsilent.sh b/t/acsilent.sh
index f17b20799..f17b20799 100755..100644
--- a/t/acsilent.sh
+++ b/t/acsilent.sh
diff --git a/t/acsubst.sh b/t/acsubst.sh
index ff629e9b2..ff629e9b2 100755..100644
--- a/t/acsubst.sh
+++ b/t/acsubst.sh
diff --git a/t/acsubst2.sh b/t/acsubst2.sh
index fc7c9ad17..fc7c9ad17 100755..100644
--- a/t/acsubst2.sh
+++ b/t/acsubst2.sh
diff --git a/t/add-missing-multiple.sh b/t/add-missing-multiple.sh
index a257ce6b5..a257ce6b5 100755..100644
--- a/t/add-missing-multiple.sh
+++ b/t/add-missing-multiple.sh
diff --git a/t/add-missing.tap b/t/add-missing.tap
index 594e46584..594e46584 100755..100644
--- a/t/add-missing.tap
+++ b/t/add-missing.tap
diff --git a/t/all-prog-libs.sh b/t/all-prog-libs.sh
index 9a8a17e50..9a8a17e50 100755..100644
--- a/t/all-prog-libs.sh
+++ b/t/all-prog-libs.sh
diff --git a/t/all.sh b/t/all.sh
index cefafe81b..cefafe81b 100755..100644
--- a/t/all.sh
+++ b/t/all.sh
diff --git a/t/all2.sh b/t/all2.sh
index 1e06cd833..1e06cd833 100755..100644
--- a/t/all2.sh
+++ b/t/all2.sh
diff --git a/t/alloca.sh b/t/alloca.sh
index 7829dbf86..7829dbf86 100755..100644
--- a/t/alloca.sh
+++ b/t/alloca.sh
diff --git a/t/alloca2.sh b/t/alloca2.sh
index 044b78a75..044b78a75 100755..100644
--- a/t/alloca2.sh
+++ b/t/alloca2.sh
diff --git a/t/alpha.sh b/t/alpha.sh
index 5f01629b9..5f01629b9 100755..100644
--- a/t/alpha.sh
+++ b/t/alpha.sh
diff --git a/t/alpha2.sh b/t/alpha2.sh
index b9a1e0f95..b9a1e0f95 100755..100644
--- a/t/alpha2.sh
+++ b/t/alpha2.sh
diff --git a/t/am-config-header.sh b/t/am-config-header.sh
index 49410e896..49410e896 100755..100644
--- a/t/am-config-header.sh
+++ b/t/am-config-header.sh
diff --git a/t/am-default-source-ext.sh b/t/am-default-source-ext.sh
index 9d6ad8ec0..9d6ad8ec0 100755..100644
--- a/t/am-default-source-ext.sh
+++ b/t/am-default-source-ext.sh
diff --git a/t/am-dir.sh b/t/am-dir.sh
index db269cb0f..db269cb0f 100755..100644
--- a/t/am-dir.sh
+++ b/t/am-dir.sh
diff --git a/t/am-macro-not-found.sh b/t/am-macro-not-found.sh
index b4dc83a74..b4dc83a74 100755..100644
--- a/t/am-macro-not-found.sh
+++ b/t/am-macro-not-found.sh
diff --git a/t/am-missing-prog.sh b/t/am-missing-prog.sh
index e30666efb..e30666efb 100755..100644
--- a/t/am-missing-prog.sh
+++ b/t/am-missing-prog.sh
diff --git a/t/am-prog-cc-c-o.sh b/t/am-prog-cc-c-o.sh
index 920a0dc93..920a0dc93 100755..100644
--- a/t/am-prog-cc-c-o.sh
+++ b/t/am-prog-cc-c-o.sh
diff --git a/t/am-prog-cc-stdc.sh b/t/am-prog-cc-stdc.sh
index e3e469c73..e3e469c73 100755..100644
--- a/t/am-prog-cc-stdc.sh
+++ b/t/am-prog-cc-stdc.sh
diff --git a/t/am-prog-mkdir-p.sh b/t/am-prog-mkdir-p.sh
index b561bfe04..b561bfe04 100755..100644
--- a/t/am-prog-mkdir-p.sh
+++ b/t/am-prog-mkdir-p.sh
diff --git a/t/am-tests-environment.sh b/t/am-tests-environment.sh
index 9c387d9f3..9c387d9f3 100755..100644
--- a/t/am-tests-environment.sh
+++ b/t/am-tests-environment.sh
diff --git a/t/am-xargs-map.sh b/t/am-xargs-map.sh
index 7d974849d..7d974849d 100755..100644
--- a/t/am-xargs-map.sh
+++ b/t/am-xargs-map.sh
diff --git a/t/amassign.sh b/t/amassign.sh
index eee85d6ba..eee85d6ba 100755..100644
--- a/t/amassign.sh
+++ b/t/amassign.sh
diff --git a/t/amhello-binpkg.sh b/t/amhello-binpkg.sh
index c7a191668..c7a191668 100755..100644
--- a/t/amhello-binpkg.sh
+++ b/t/amhello-binpkg.sh
diff --git a/t/amhello-cflags.sh b/t/amhello-cflags.sh
index b67fb4fd5..b67fb4fd5 100755..100644
--- a/t/amhello-cflags.sh
+++ b/t/amhello-cflags.sh
diff --git a/t/amhello-cross-compile.sh b/t/amhello-cross-compile.sh
index cdff77622..cdff77622 100755..100644
--- a/t/amhello-cross-compile.sh
+++ b/t/amhello-cross-compile.sh
diff --git a/t/aminit-moreargs-deprecation.sh b/t/aminit-moreargs-deprecation.sh
index d704c983f..d704c983f 100755..100644
--- a/t/aminit-moreargs-deprecation.sh
+++ b/t/aminit-moreargs-deprecation.sh
diff --git a/t/amopt.sh b/t/amopt.sh
index 19c2c7a9f..19c2c7a9f 100755..100644
--- a/t/amopt.sh
+++ b/t/amopt.sh
diff --git a/t/amopts-location.sh b/t/amopts-location.sh
index 05356c1b5..05356c1b5 100755..100644
--- a/t/amopts-location.sh
+++ b/t/amopts-location.sh
diff --git a/t/amopts-variable-expansion.sh b/t/amopts-variable-expansion.sh
index 9ffa8d121..9ffa8d121 100755..100644
--- a/t/amopts-variable-expansion.sh
+++ b/t/amopts-variable-expansion.sh
diff --git a/t/amsubst.sh b/t/amsubst.sh
index 8b42e184a..8b42e184a 100755..100644
--- a/t/amsubst.sh
+++ b/t/amsubst.sh
diff --git a/t/ar-lib.sh b/t/ar-lib.sh
index c59cd0b11..c59cd0b11 100755..100644
--- a/t/ar-lib.sh
+++ b/t/ar-lib.sh
diff --git a/t/ar-lib2.sh b/t/ar-lib2.sh
index 74b6393b3..74b6393b3 100755..100644
--- a/t/ar-lib2.sh
+++ b/t/ar-lib2.sh
diff --git a/t/ar-lib3.sh b/t/ar-lib3.sh
index b9b8f8da1..b9b8f8da1 100755..100644
--- a/t/ar-lib3.sh
+++ b/t/ar-lib3.sh
diff --git a/t/ar-lib4.sh b/t/ar-lib4.sh
index 4d3c40ae0..4d3c40ae0 100755..100644
--- a/t/ar-lib4.sh
+++ b/t/ar-lib4.sh
diff --git a/t/ar-lib5a.sh b/t/ar-lib5a.sh
index 78488cf4b..78488cf4b 100755..100644
--- a/t/ar-lib5a.sh
+++ b/t/ar-lib5a.sh
diff --git a/t/ar-lib5b.sh b/t/ar-lib5b.sh
index aff1eb16e..aff1eb16e 100755..100644
--- a/t/ar-lib5b.sh
+++ b/t/ar-lib5b.sh
diff --git a/t/ar-lib6a.sh b/t/ar-lib6a.sh
index cb386ed6e..cb386ed6e 100755..100644
--- a/t/ar-lib6a.sh
+++ b/t/ar-lib6a.sh
diff --git a/t/ar-lib6b.sh b/t/ar-lib6b.sh
index 88fdac414..88fdac414 100755..100644
--- a/t/ar-lib6b.sh
+++ b/t/ar-lib6b.sh
diff --git a/t/ar-lib7.sh b/t/ar-lib7.sh
index 587de49a9..587de49a9 100755..100644
--- a/t/ar-lib7.sh
+++ b/t/ar-lib7.sh
diff --git a/t/ar.sh b/t/ar.sh
index 58fbf8b44..58fbf8b44 100755..100644
--- a/t/ar.sh
+++ b/t/ar.sh
diff --git a/t/ar2.sh b/t/ar2.sh
index fd2d9b402..fd2d9b402 100755..100644
--- a/t/ar2.sh
+++ b/t/ar2.sh
diff --git a/t/ar3.sh b/t/ar3.sh
index a41ce15cf..a41ce15cf 100755..100644
--- a/t/ar3.sh
+++ b/t/ar3.sh
diff --git a/t/ar4.sh b/t/ar4.sh
index 388f602aa..388f602aa 100755..100644
--- a/t/ar4.sh
+++ b/t/ar4.sh
diff --git a/t/ar5.sh b/t/ar5.sh
index d44976ce9..d44976ce9 100755..100644
--- a/t/ar5.sh
+++ b/t/ar5.sh
diff --git a/t/asm.sh b/t/asm.sh
index d465033fe..d465033fe 100755..100644
--- a/t/asm.sh
+++ b/t/asm.sh
diff --git a/t/asm2.sh b/t/asm2.sh
index 5c731f459..5c731f459 100755..100644
--- a/t/asm2.sh
+++ b/t/asm2.sh
diff --git a/t/asm3.sh b/t/asm3.sh
index 967af1de5..967af1de5 100755..100644
--- a/t/asm3.sh
+++ b/t/asm3.sh
diff --git a/t/autodist-aclocal-m4.sh b/t/autodist-aclocal-m4.sh
index f602bbcdb..f602bbcdb 100755..100644
--- a/t/autodist-aclocal-m4.sh
+++ b/t/autodist-aclocal-m4.sh
diff --git a/t/autodist-configure-no-subdir.sh b/t/autodist-configure-no-subdir.sh
index e9325f8c9..e9325f8c9 100755..100644
--- a/t/autodist-configure-no-subdir.sh
+++ b/t/autodist-configure-no-subdir.sh
diff --git a/t/autodist-no-duplicate.sh b/t/autodist-no-duplicate.sh
index 7f5ed1d52..7f5ed1d52 100755..100644
--- a/t/autodist-no-duplicate.sh
+++ b/t/autodist-no-duplicate.sh
diff --git a/t/autodist-stamp-vti.sh b/t/autodist-stamp-vti.sh
index 2bd3fe035..2bd3fe035 100755..100644
--- a/t/autodist-stamp-vti.sh
+++ b/t/autodist-stamp-vti.sh
diff --git a/t/autodist-subdir.sh b/t/autodist-subdir.sh
index c56f88ecf..c56f88ecf 100755..100644
--- a/t/autodist-subdir.sh
+++ b/t/autodist-subdir.sh
diff --git a/t/autodist.sh b/t/autodist.sh
index 20dd95ba7..20dd95ba7 100755..100644
--- a/t/autodist.sh
+++ b/t/autodist.sh
diff --git a/t/autohdr-subdir-pr12495.sh b/t/autohdr-subdir-pr12495.sh
index 72d72100b..72d72100b 100755..100644
--- a/t/autohdr-subdir-pr12495.sh
+++ b/t/autohdr-subdir-pr12495.sh
diff --git a/t/autohdr.sh b/t/autohdr.sh
index 3735d0e49..3735d0e49 100755..100644
--- a/t/autohdr.sh
+++ b/t/autohdr.sh
diff --git a/t/autohdr3.sh b/t/autohdr3.sh
index c1658ba6d..c1658ba6d 100755..100644
--- a/t/autohdr3.sh
+++ b/t/autohdr3.sh
diff --git a/t/autohdr4.sh b/t/autohdr4.sh
index 4295aa19f..4295aa19f 100755..100644
--- a/t/autohdr4.sh
+++ b/t/autohdr4.sh
diff --git a/t/autohdrdry.sh b/t/autohdrdry.sh
index a4c2bceb9..a4c2bceb9 100755..100644
--- a/t/autohdrdry.sh
+++ b/t/autohdrdry.sh
diff --git a/t/automake-cmdline.tap b/t/automake-cmdline.tap
index 974b99e5c..974b99e5c 100755..100644
--- a/t/automake-cmdline.tap
+++ b/t/automake-cmdline.tap
diff --git a/t/auxdir-autodetect.sh b/t/auxdir-autodetect.sh
index 17567c0fc..457e06a52 100755..100644
--- a/t/auxdir-autodetect.sh
+++ b/t/auxdir-autodetect.sh
@@ -21,7 +21,7 @@
 
 nil=__no_such_program
 
-unset NONESUCH || :
+unset NONESUCH
 
 cat >>configure.ac << END
 AM_MISSING_PROG([NONESUCH],[$nil])
diff --git a/t/auxdir-computed.tap b/t/auxdir-computed.tap
index ceb3acde8..ceb3acde8 100755..100644
--- a/t/auxdir-computed.tap
+++ b/t/auxdir-computed.tap
diff --git a/t/auxdir-misplaced.sh b/t/auxdir-misplaced.sh
index 529aff410..529aff410 100755..100644
--- a/t/auxdir-misplaced.sh
+++ b/t/auxdir-misplaced.sh
diff --git a/t/auxdir-nonexistent.sh b/t/auxdir-nonexistent.sh
index 58617f674..58617f674 100755..100644
--- a/t/auxdir-nonexistent.sh
+++ b/t/auxdir-nonexistent.sh
diff --git a/t/auxdir-unportable.tap b/t/auxdir-unportable.tap
index 38b73244d..38b73244d 100755..100644
--- a/t/auxdir-unportable.tap
+++ b/t/auxdir-unportable.tap
diff --git a/t/auxdir.sh b/t/auxdir.sh
index 3a8197ac5..3a8197ac5 100755..100644
--- a/t/auxdir.sh
+++ b/t/auxdir.sh
diff --git a/t/auxdir6.sh b/t/auxdir6.sh
index d73043156..d73043156 100755..100644
--- a/t/auxdir6.sh
+++ b/t/auxdir6.sh
diff --git a/t/auxdir7.sh b/t/auxdir7.sh
index aa17801b9..aa17801b9 100755..100644
--- a/t/auxdir7.sh
+++ b/t/auxdir7.sh
diff --git a/t/auxdir8.sh b/t/auxdir8.sh
index d9a05f764..d9a05f764 100755..100644
--- a/t/auxdir8.sh
+++ b/t/auxdir8.sh
diff --git a/t/ax/am-test-lib.sh b/t/ax/am-test-lib.sh
index 8214315fb..9120336fa 100644
--- a/t/ax/am-test-lib.sh
+++ b/t/ax/am-test-lib.sh
@@ -34,11 +34,6 @@ distdir=$me-1.0
 ##  Environment cleanup.  ##
 ## ---------------------- ##
 
-# Temporarily disable this, since some shells (e.g., older version
-# of Bash) can return a non-zero exit status upon the when a non-set
-# variable is unset.
-set +e
-
 # Unset some make-related variables that may cause $MAKE to act like
 # a recursively invoked sub-make.  Any $MAKE invocation in a test is
 # conceptually an independent invocation, not part of the main
@@ -85,9 +80,6 @@ for pfx in TEST_ SH_ TAP_ ''; do
 done
 unset pfx
 
-# Re-enable, it had been temporarily disabled above.
-set -e
-
 # cross_compiling
 # ---------------
 # Tell whether we are cross-compiling.  This is especially useful to skip
@@ -677,7 +669,7 @@ process_requirements ()
       *" $am_tool"*) . ./t/$am_tool-macros.dir/get.sh;;
     esac
   done
-  am_tool=; unset am_tool
+  unset am_tool
 }
 
 ## ---------------------------------------------------------------- ##
diff --git a/t/ax/deltree.pl b/t/ax/deltree.pl
new file mode 100644
index 000000000..70607662f
--- /dev/null
+++ b/t/ax/deltree.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+# deltree: recursively removes file and directory,
+# trying to handle permissions and other complications.
+
+use strict;
+use warnings FATAL => 'all';
+use File::Path qw/rmtree/;
+
+my $exit_status = 0;
+local $SIG{__WARN__} = sub { warn "@_"; $exit_status = 1; };
+
+foreach my $path (@ARGV) {
+  local $@ = undef;
+  rmtree ($path);
+}
+
+exit $exit_status;
+
+# vim: ft=perl ts=4 sw=4 et
diff --git a/t/ax/test-defs.in b/t/ax/test-defs.in
index 9662c792b..c716cab97 100644
--- a/t/ax/test-defs.in
+++ b/t/ax/test-defs.in
@@ -107,7 +107,7 @@ AUTORECONF=${AM_TESTSUITE_AUTORECONF-${AUTORECONF-'@am_AUTORECONF@'}}
 AUTOHEADER=${AM_TESTSUITE_AUTOHEADER-${AUTOHEADER-'@am_AUTOHEADER@'}}
 AUTOUPDATE=${AM_TESTSUITE_AUTOUPDATE-${AUTOUPDATE-'@am_AUTOUPDATE@'}}
 
-# Tests who want complete control over aclocal or automake command-line
+# Tests which want complete control over aclocal or automake command-line
 # options should use $am_original_ACLOCAL or $am_original_AUTOMAKE.  The
 # "test -z" tests take care not to re-initialize them if 'test-defs.sh'
 # is re-sourced, as we want that file to remain really idempotent.
@@ -118,9 +118,9 @@ if test -z "$am_original_ACLOCAL"; then
   am_original_ACLOCAL=${AM_TESTSUITE_ACLOCAL-${ACLOCAL-"aclocal-$APIVERSION"}}
 fi
 
-# Use -Werror because this also turns some Perl warnings into error.
-# Tests for which this is inappropriate should use -Wno-error.
-# Tests who want complete control over aclocal command-line options
+# Use -Werror by default.  Tests for which this is inappropriate should
+# use -Wno-error.
+# Tests which want complete control over aclocal command-line options
 # should use $am_original_ACLOCAL instead.
 ACLOCAL="$am_original_ACLOCAL -Werror"
 
diff --git a/t/ax/test-lib.sh b/t/ax/test-lib.sh
index 9476711ed..4387ad495 100644
--- a/t/ax/test-lib.sh
+++ b/t/ax/test-lib.sh
@@ -92,7 +92,7 @@ _am_exit ()
   set +e
   # See comments in the exit trap for the reason we do this.
   test 77 = $1 && am__test_skipped=yes
-  # Spurious escaping to ensure we do not call our 'exit' alias.
+  # Extra escaping to ensure we do not call our 'exit' alias.
   (\exit $1); \exit $1
 }
 # Avoid interferences from the environment
@@ -101,6 +101,23 @@ am__test_skipped=no
 # just inside a function definition.  Weird, but real.
 alias exit=_am_exit
 
+# In some shells (e.g., Solaris 10 /bin/ksh, or NetBSD 5.1 /bin/sh),
+# "unset VAR" returns a non-zero exit status in case the VAR variable
+# is already unset.  This doesn't interact well with our usage of
+# "set -e" in the testsuite.  This function and the alias below help
+# to work around the issue.
+_am_unset ()
+{
+  for _am_v
+  do
+    # Extra escaping (here and below) to ensure we do not call our
+    # 'unset' alias.
+    eval ${_am_v}=dummy && \unset ${_am_v} || exit 1
+  done
+  \unset _am_v
+}
+alias unset=_am_unset
+
 ## ------------------------------------ ##
 ##  General testsuite shell functions.  ##
 ## ------------------------------------ ##
@@ -181,10 +198,7 @@ seq_ ()
 rm_rf_ ()
 {
   test $# -gt 0 || return 0
-  # Ignore failures in find, we are only interested in failures of the
-  # final rm.
-  find "$@" -type d ! -perm -700 -exec chmod u+rwx {} \; || :
-  rm -rf "$@"
+  $PERL "$am_testaux_srcdir"/deltree.pl "$@"
 }
 
 commented_sed_unindent_prog='
diff --git a/t/backcompat-acout.sh b/t/backcompat-acout.sh
index a6d2d3486..a6d2d3486 100755..100644
--- a/t/backcompat-acout.sh
+++ b/t/backcompat-acout.sh
diff --git a/t/backcompat.sh b/t/backcompat.sh
index 7ca7a5044..7ca7a5044 100755..100644
--- a/t/backcompat.sh
+++ b/t/backcompat.sh
diff --git a/t/backcompat2.sh b/t/backcompat2.sh
index b62914063..b62914063 100755..100644
--- a/t/backcompat2.sh
+++ b/t/backcompat2.sh
diff --git a/t/backcompat3.sh b/t/backcompat3.sh
index f95ef7bc5..f95ef7bc5 100755..100644
--- a/t/backcompat3.sh
+++ b/t/backcompat3.sh
diff --git a/t/backcompat6.sh b/t/backcompat6.sh
index e9e14cc0e..e9e14cc0e 100755..100644
--- a/t/backcompat6.sh
+++ b/t/backcompat6.sh
diff --git a/t/backslash-before-trailing-whitespace.sh b/t/backslash-before-trailing-whitespace.sh
index f0d13643e..f0d13643e 100755..100644
--- a/t/backslash-before-trailing-whitespace.sh
+++ b/t/backslash-before-trailing-whitespace.sh
diff --git a/t/backslash-issues.sh b/t/backslash-issues.sh
index 6b0a9a198..6b0a9a198 100755..100644
--- a/t/backslash-issues.sh
+++ b/t/backslash-issues.sh
diff --git a/t/backslash-tricks.sh b/t/backslash-tricks.sh
index eba6e00b8..eba6e00b8 100755..100644
--- a/t/backslash-tricks.sh
+++ b/t/backslash-tricks.sh
diff --git a/t/badline.sh b/t/badline.sh
index 619e7a64b..619e7a64b 100755..100644
--- a/t/badline.sh
+++ b/t/badline.sh
diff --git a/t/badopt.sh b/t/badopt.sh
index 6cd0eed5b..6cd0eed5b 100755..100644
--- a/t/badopt.sh
+++ b/t/badopt.sh
diff --git a/t/badprog.sh b/t/badprog.sh
index da6318b02..da6318b02 100755..100644
--- a/t/badprog.sh
+++ b/t/badprog.sh
diff --git a/t/built-sources-check.sh b/t/built-sources-check.sh
index e528b707d..e528b707d 100755..100644
--- a/t/built-sources-check.sh
+++ b/t/built-sources-check.sh
diff --git a/t/built-sources-cond.sh b/t/built-sources-cond.sh
index 3a0b6b81a..3a0b6b81a 100755..100644
--- a/t/built-sources-cond.sh
+++ b/t/built-sources-cond.sh
diff --git a/t/built-sources-fork-bomb.sh b/t/built-sources-fork-bomb.sh
index b1ef2e70c..b1ef2e70c 100755..100644
--- a/t/built-sources-fork-bomb.sh
+++ b/t/built-sources-fork-bomb.sh
diff --git a/t/built-sources-install.sh b/t/built-sources-install.sh
index 3c1a01d19..3c1a01d19 100755..100644
--- a/t/built-sources-install.sh
+++ b/t/built-sources-install.sh
diff --git a/t/built-sources-subdir.sh b/t/built-sources-subdir.sh
index 7a591c69c..7a591c69c 100755..100644
--- a/t/built-sources-subdir.sh
+++ b/t/built-sources-subdir.sh
diff --git a/t/built-sources.sh b/t/built-sources.sh
index f662ad561..f662ad561 100755..100644
--- a/t/built-sources.sh
+++ b/t/built-sources.sh
diff --git a/t/c-demo.sh b/t/c-demo.sh
index a0012e2cc..a0012e2cc 100755..100644
--- a/t/c-demo.sh
+++ b/t/c-demo.sh
diff --git a/t/candist.sh b/t/candist.sh
index 5092eca7c..5092eca7c 100755..100644
--- a/t/candist.sh
+++ b/t/candist.sh
diff --git a/t/canon-name.sh b/t/canon-name.sh
index e5d3c773d..e5d3c773d 100755..100644
--- a/t/canon-name.sh
+++ b/t/canon-name.sh
diff --git a/t/canon.sh b/t/canon.sh
index 1e29efc42..1e29efc42 100755..100644
--- a/t/canon.sh
+++ b/t/canon.sh
diff --git a/t/canon2.sh b/t/canon2.sh
index 8e47b620e..8e47b620e 100755..100644
--- a/t/canon2.sh
+++ b/t/canon2.sh
diff --git a/t/canon3.sh b/t/canon3.sh
index 895cf1c7e..895cf1c7e 100755..100644
--- a/t/canon3.sh
+++ b/t/canon3.sh
diff --git a/t/canon4.sh b/t/canon4.sh
index e4eb10ab5..e4eb10ab5 100755..100644
--- a/t/canon4.sh
+++ b/t/canon4.sh
diff --git a/t/canon5.sh b/t/canon5.sh
index a67a729b4..a67a729b4 100755..100644
--- a/t/canon5.sh
+++ b/t/canon5.sh
diff --git a/t/canon6.sh b/t/canon6.sh
index 784158aae..784158aae 100755..100644
--- a/t/canon6.sh
+++ b/t/canon6.sh
diff --git a/t/canon7.sh b/t/canon7.sh
index ad249b217..ad249b217 100755..100644
--- a/t/canon7.sh
+++ b/t/canon7.sh
diff --git a/t/canon8.sh b/t/canon8.sh
index 85b729a2b..85b729a2b 100755..100644
--- a/t/canon8.sh
+++ b/t/canon8.sh
diff --git a/t/ccnoco.sh b/t/ccnoco.sh
index be9be375e..be9be375e 100755..100644
--- a/t/ccnoco.sh
+++ b/t/ccnoco.sh
diff --git a/t/ccnoco3.sh b/t/ccnoco3.sh
index 0379f7390..0379f7390 100755..100644
--- a/t/ccnoco3.sh
+++ b/t/ccnoco3.sh
diff --git a/t/ccnoco4.sh b/t/ccnoco4.sh
index beb02daae..beb02daae 100755..100644
--- a/t/ccnoco4.sh
+++ b/t/ccnoco4.sh
diff --git a/t/check-concurrency-bug9245.sh b/t/check-concurrency-bug9245.sh
index 2494d19c2..2494d19c2 100755..100644
--- a/t/check-concurrency-bug9245.sh
+++ b/t/check-concurrency-bug9245.sh
diff --git a/t/check-exported-srcdir.sh b/t/check-exported-srcdir.sh
index 3f7178ea4..3f7178ea4 100755..100644
--- a/t/check-exported-srcdir.sh
+++ b/t/check-exported-srcdir.sh
diff --git a/t/check-fd-redirect.sh b/t/check-fd-redirect.sh
index 661c59aee..661c59aee 100755..100644
--- a/t/check-fd-redirect.sh
+++ b/t/check-fd-redirect.sh
diff --git a/t/check-no-test-driver.sh b/t/check-no-test-driver.sh
index 976d19eb2..976d19eb2 100755..100644
--- a/t/check-no-test-driver.sh
+++ b/t/check-no-test-driver.sh
diff --git a/t/check-subst-prog.sh b/t/check-subst-prog.sh
index 55461411a..55461411a 100755..100644
--- a/t/check-subst-prog.sh
+++ b/t/check-subst-prog.sh
diff --git a/t/check-subst.sh b/t/check-subst.sh
index 7b23082be..7b23082be 100755..100644
--- a/t/check-subst.sh
+++ b/t/check-subst.sh
diff --git a/t/check-tests-in-builddir.sh b/t/check-tests-in-builddir.sh
index fad652731..1c41368a1 100755..100644
--- a/t/check-tests-in-builddir.sh
+++ b/t/check-tests-in-builddir.sh
@@ -35,7 +35,7 @@ exit ${FOO_EXIT_STATUS-0}
 END
 chmod a+x foo.test
 
-unset FOO_EXIT_STATUS || :
+unset FOO_EXIT_STATUS
 
 $ACLOCAL
 $AUTOCONF
diff --git a/t/check10.sh b/t/check10.sh
index 8cec5944d..8cec5944d 100755..100644
--- a/t/check10.sh
+++ b/t/check10.sh
diff --git a/t/check11.sh b/t/check11.sh
index 54c692435..54c692435 100755..100644
--- a/t/check11.sh
+++ b/t/check11.sh
diff --git a/t/check12.sh b/t/check12.sh
index 5922a78a9..5922a78a9 100755..100644
--- a/t/check12.sh
+++ b/t/check12.sh
diff --git a/t/check2.sh b/t/check2.sh
index 0662e505f..0662e505f 100755..100644
--- a/t/check2.sh
+++ b/t/check2.sh
diff --git a/t/check4.sh b/t/check4.sh
index a7f8d28e8..a7f8d28e8 100755..100644
--- a/t/check4.sh
+++ b/t/check4.sh
diff --git a/t/check5.sh b/t/check5.sh
index 4ef8c502b..4ef8c502b 100755..100644
--- a/t/check5.sh
+++ b/t/check5.sh
diff --git a/t/check6.sh b/t/check6.sh
index 283159ac2..283159ac2 100755..100644
--- a/t/check6.sh
+++ b/t/check6.sh
diff --git a/t/check7.sh b/t/check7.sh
index a06eab98e..a06eab98e 100755..100644
--- a/t/check7.sh
+++ b/t/check7.sh
diff --git a/t/check8.sh b/t/check8.sh
index e375db067..e375db067 100755..100644
--- a/t/check8.sh
+++ b/t/check8.sh
diff --git a/t/clean-many.sh b/t/clean-many.sh
index e916dfa9b..e916dfa9b 100755..100644
--- a/t/clean-many.sh
+++ b/t/clean-many.sh
diff --git a/t/clean-many2.sh b/t/clean-many2.sh
index a10cd6862..a10cd6862 100755..100644
--- a/t/clean-many2.sh
+++ b/t/clean-many2.sh
diff --git a/t/cleanvars.sh b/t/cleanvars.sh
index db3ac5911..db3ac5911 100755..100644
--- a/t/cleanvars.sh
+++ b/t/cleanvars.sh
diff --git a/t/colneq2.sh b/t/colneq2.sh
index 7daa116ae..7daa116ae 100755..100644
--- a/t/colneq2.sh
+++ b/t/colneq2.sh
diff --git a/t/colon.sh b/t/colon.sh
index 6bd04b088..6bd04b088 100755..100644
--- a/t/colon.sh
+++ b/t/colon.sh
diff --git a/t/colon2.sh b/t/colon2.sh
index 9eeaf3648..9eeaf3648 100755..100644
--- a/t/colon2.sh
+++ b/t/colon2.sh
diff --git a/t/colon3.sh b/t/colon3.sh
index db1e4bb98..db1e4bb98 100755..100644
--- a/t/colon3.sh
+++ b/t/colon3.sh
diff --git a/t/colon4.sh b/t/colon4.sh
index 8d057b62e..8d057b62e 100755..100644
--- a/t/colon4.sh
+++ b/t/colon4.sh
diff --git a/t/colon5.sh b/t/colon5.sh
index ff2f819f8..ff2f819f8 100755..100644
--- a/t/colon5.sh
+++ b/t/colon5.sh
diff --git a/t/colon6.sh b/t/colon6.sh
index a60842f21..a60842f21 100755..100644
--- a/t/colon6.sh
+++ b/t/colon6.sh
diff --git a/t/colon7.sh b/t/colon7.sh
index d985b6157..d985b6157 100755..100644
--- a/t/colon7.sh
+++ b/t/colon7.sh
diff --git a/t/color-tests-opt.sh b/t/color-tests-opt.sh
index e7aa17ad6..e7aa17ad6 100755..100644
--- a/t/color-tests-opt.sh
+++ b/t/color-tests-opt.sh
diff --git a/t/color-tests.sh b/t/color-tests.sh
index a6c2371fa..a6c2371fa 100755..100644
--- a/t/color-tests.sh
+++ b/t/color-tests.sh
diff --git a/t/color-tests2.sh b/t/color-tests2.sh
index 4f136e7de..4f136e7de 100755..100644
--- a/t/color-tests2.sh
+++ b/t/color-tests2.sh
diff --git a/t/comment-block.sh b/t/comment-block.sh
index af1136d42..af1136d42 100755..100644
--- a/t/comment-block.sh
+++ b/t/comment-block.sh
diff --git a/t/comment.sh b/t/comment.sh
index a1466e5bd..a1466e5bd 100755..100644
--- a/t/comment.sh
+++ b/t/comment.sh
diff --git a/t/comment2.sh b/t/comment2.sh
index b5e1b71dc..b5e1b71dc 100755..100644
--- a/t/comment2.sh
+++ b/t/comment2.sh
diff --git a/t/comment4.sh b/t/comment4.sh
index e53ea8053..e53ea8053 100755..100644
--- a/t/comment4.sh
+++ b/t/comment4.sh
diff --git a/t/comment6.sh b/t/comment6.sh
index 2e44035ca..2e44035ca 100755..100644
--- a/t/comment6.sh
+++ b/t/comment6.sh
diff --git a/t/comment7.sh b/t/comment7.sh
index 60db30372..60db30372 100755..100644
--- a/t/comment7.sh
+++ b/t/comment7.sh
diff --git a/t/comment8.sh b/t/comment8.sh
index 380528763..380528763 100755..100644
--- a/t/comment8.sh
+++ b/t/comment8.sh
diff --git a/t/comment9.sh b/t/comment9.sh
index 4494490e8..4494490e8 100755..100644
--- a/t/comment9.sh
+++ b/t/comment9.sh
diff --git a/t/comments-in-var-def.sh b/t/comments-in-var-def.sh
index cdcb550b8..cdcb550b8 100755..100644
--- a/t/comments-in-var-def.sh
+++ b/t/comments-in-var-def.sh
diff --git a/t/compile.sh b/t/compile.sh
index 5cad98932..5cad98932 100755..100644
--- a/t/compile.sh
+++ b/t/compile.sh
diff --git a/t/compile2.sh b/t/compile2.sh
index a1b173df8..a1b173df8 100755..100644
--- a/t/compile2.sh
+++ b/t/compile2.sh
diff --git a/t/compile3.sh b/t/compile3.sh
index bf281a093..bf281a093 100755..100644
--- a/t/compile3.sh
+++ b/t/compile3.sh
diff --git a/t/compile4.sh b/t/compile4.sh
index ddabe3143..ddabe3143 100755..100644
--- a/t/compile4.sh
+++ b/t/compile4.sh
diff --git a/t/compile5.sh b/t/compile5.sh
index 42510a641..42510a641 100755..100644
--- a/t/compile5.sh
+++ b/t/compile5.sh
diff --git a/t/compile6.sh b/t/compile6.sh
index 3b6455c3d..3b6455c3d 100755..100644
--- a/t/compile6.sh
+++ b/t/compile6.sh
diff --git a/t/compile_f90_c_cxx.sh b/t/compile_f90_c_cxx.sh
index b833835b4..b833835b4 100755..100644
--- a/t/compile_f90_c_cxx.sh
+++ b/t/compile_f90_c_cxx.sh
diff --git a/t/compile_f_c_cxx.sh b/t/compile_f_c_cxx.sh
index a0b0e216f..4b9189d61 100755..100644
--- a/t/compile_f_c_cxx.sh
+++ b/t/compile_f_c_cxx.sh
@@ -38,9 +38,18 @@ END
 $ACLOCAL
 $AUTOMAKE
 
+$FGREP COMPILE Makefile.in # For debugging.
+
 # Look for the macros at the beginning of rules.
-$FGREP "$tab\$(AM_V_CC)\$(COMPILE)"     Makefile.in
-$FGREP "$tab\$(AM_V_CXX)\$(CXXCOMPILE)" Makefile.in
-$FGREP "$tab\$(AM_V_F77)\$(F77COMPILE)" Makefile.in
+
+sed -e "s|$tab *&& *|$tab|" \
+    -e 's|$(AM_V_CC)||g' \
+    -e 's|$(AM_V_CXX)||g' \
+    -e 's|$(AM_V_F77)||g' \
+  Makefile.in >mk
+diff -u Makefile.in mk || : # For debugging.
+$FGREP "$tab\$(COMPILE)"    mk
+$FGREP "$tab\$(CXXCOMPILE)" mk
+$FGREP "$tab\$(F77COMPILE)" mk
 
 :
diff --git a/t/cond-basic.sh b/t/cond-basic.sh
index 4b334a140..4b334a140 100755..100644
--- a/t/cond-basic.sh
+++ b/t/cond-basic.sh
diff --git a/t/cond.sh b/t/cond.sh
index 5d690c202..5d690c202 100755..100644
--- a/t/cond.sh
+++ b/t/cond.sh
diff --git a/t/cond10.sh b/t/cond10.sh
index 896ef61e4..896ef61e4 100755..100644
--- a/t/cond10.sh
+++ b/t/cond10.sh
diff --git a/t/cond11.sh b/t/cond11.sh
index 7d729d8f1..7d729d8f1 100755..100644
--- a/t/cond11.sh
+++ b/t/cond11.sh
diff --git a/t/cond13.sh b/t/cond13.sh
index fbffd7531..fbffd7531 100755..100644
--- a/t/cond13.sh
+++ b/t/cond13.sh
diff --git a/t/cond14.sh b/t/cond14.sh
index 67790e2db..67790e2db 100755..100644
--- a/t/cond14.sh
+++ b/t/cond14.sh
diff --git a/t/cond15.sh b/t/cond15.sh
index 8f2f894d8..8f2f894d8 100755..100644
--- a/t/cond15.sh
+++ b/t/cond15.sh
diff --git a/t/cond16.sh b/t/cond16.sh
index 80b0a6315..80b0a6315 100755..100644
--- a/t/cond16.sh
+++ b/t/cond16.sh
diff --git a/t/cond17.sh b/t/cond17.sh
index 316b39ea0..316b39ea0 100755..100644
--- a/t/cond17.sh
+++ b/t/cond17.sh
diff --git a/t/cond18.sh b/t/cond18.sh
index 1d485891f..1d485891f 100755..100644
--- a/t/cond18.sh
+++ b/t/cond18.sh
diff --git a/t/cond19.sh b/t/cond19.sh
index a2556f32f..a2556f32f 100755..100644
--- a/t/cond19.sh
+++ b/t/cond19.sh
diff --git a/t/cond20.sh b/t/cond20.sh
index c496a2390..c496a2390 100755..100644
--- a/t/cond20.sh
+++ b/t/cond20.sh
diff --git a/t/cond21.sh b/t/cond21.sh
index 4993a5c8c..4993a5c8c 100755..100644
--- a/t/cond21.sh
+++ b/t/cond21.sh
diff --git a/t/cond22.sh b/t/cond22.sh
index d506f95f9..d506f95f9 100755..100644
--- a/t/cond22.sh
+++ b/t/cond22.sh
diff --git a/t/cond23.sh b/t/cond23.sh
index 2a7758e7a..2a7758e7a 100755..100644
--- a/t/cond23.sh
+++ b/t/cond23.sh
diff --git a/t/cond24.sh b/t/cond24.sh
index 54a379b93..54a379b93 100755..100644
--- a/t/cond24.sh
+++ b/t/cond24.sh
diff --git a/t/cond25.sh b/t/cond25.sh
index 7ddf20d15..7ddf20d15 100755..100644
--- a/t/cond25.sh
+++ b/t/cond25.sh
diff --git a/t/cond26.sh b/t/cond26.sh
index cfa304cde..cfa304cde 100755..100644
--- a/t/cond26.sh
+++ b/t/cond26.sh
diff --git a/t/cond27.sh b/t/cond27.sh
index 95ae25d2b..95ae25d2b 100755..100644
--- a/t/cond27.sh
+++ b/t/cond27.sh
diff --git a/t/cond28.sh b/t/cond28.sh
index 7e76472d2..7e76472d2 100755..100644
--- a/t/cond28.sh
+++ b/t/cond28.sh
diff --git a/t/cond3.sh b/t/cond3.sh
index 5bf7bf714..5bf7bf714 100755..100644
--- a/t/cond3.sh
+++ b/t/cond3.sh
diff --git a/t/cond30.sh b/t/cond30.sh
index e54e2272d..e54e2272d 100755..100644
--- a/t/cond30.sh
+++ b/t/cond30.sh
diff --git a/t/cond31.sh b/t/cond31.sh
index 06215b037..06215b037 100755..100644
--- a/t/cond31.sh
+++ b/t/cond31.sh
diff --git a/t/cond32.sh b/t/cond32.sh
index f3cfc4e01..f3cfc4e01 100755..100644
--- a/t/cond32.sh
+++ b/t/cond32.sh
diff --git a/t/cond33.sh b/t/cond33.sh
index 80ff1c785..80ff1c785 100755..100644
--- a/t/cond33.sh
+++ b/t/cond33.sh
diff --git a/t/cond34.sh b/t/cond34.sh
index ea78a7140..ea78a7140 100755..100644
--- a/t/cond34.sh
+++ b/t/cond34.sh
diff --git a/t/cond35.sh b/t/cond35.sh
index d12f75f62..d12f75f62 100755..100644
--- a/t/cond35.sh
+++ b/t/cond35.sh
diff --git a/t/cond36.sh b/t/cond36.sh
index 896dbfa99..896dbfa99 100755..100644
--- a/t/cond36.sh
+++ b/t/cond36.sh
diff --git a/t/cond37.sh b/t/cond37.sh
index 18beca159..18beca159 100755..100644
--- a/t/cond37.sh
+++ b/t/cond37.sh
diff --git a/t/cond38.sh b/t/cond38.sh
index 71c1fe92b..71c1fe92b 100755..100644
--- a/t/cond38.sh
+++ b/t/cond38.sh
diff --git a/t/cond39.sh b/t/cond39.sh
index 3e33d00ef..3e33d00ef 100755..100644
--- a/t/cond39.sh
+++ b/t/cond39.sh
diff --git a/t/cond4.sh b/t/cond4.sh
index 562a88e09..562a88e09 100755..100644
--- a/t/cond4.sh
+++ b/t/cond4.sh
diff --git a/t/cond40.sh b/t/cond40.sh
index f11f29e67..f11f29e67 100755..100644
--- a/t/cond40.sh
+++ b/t/cond40.sh
diff --git a/t/cond41.sh b/t/cond41.sh
index 87d4421fb..87d4421fb 100755..100644
--- a/t/cond41.sh
+++ b/t/cond41.sh
diff --git a/t/cond42.sh b/t/cond42.sh
index 9f788c9e3..9f788c9e3 100755..100644
--- a/t/cond42.sh
+++ b/t/cond42.sh
diff --git a/t/cond43.sh b/t/cond43.sh
index dd48f6949..dd48f6949 100755..100644
--- a/t/cond43.sh
+++ b/t/cond43.sh
diff --git a/t/cond44.sh b/t/cond44.sh
index 323622e64..323622e64 100755..100644
--- a/t/cond44.sh
+++ b/t/cond44.sh
diff --git a/t/cond45.sh b/t/cond45.sh
index 81fc8f2d7..81fc8f2d7 100755..100644
--- a/t/cond45.sh
+++ b/t/cond45.sh
diff --git a/t/cond46.sh b/t/cond46.sh
index c50fec95b..c50fec95b 100755..100644
--- a/t/cond46.sh
+++ b/t/cond46.sh
diff --git a/t/cond5.sh b/t/cond5.sh
index ee9d132ca..ee9d132ca 100755..100644
--- a/t/cond5.sh
+++ b/t/cond5.sh
diff --git a/t/cond6.sh b/t/cond6.sh
index 17e5a29e4..17e5a29e4 100755..100644
--- a/t/cond6.sh
+++ b/t/cond6.sh
diff --git a/t/cond7.sh b/t/cond7.sh
index c4230a030..c4230a030 100755..100644
--- a/t/cond7.sh
+++ b/t/cond7.sh
diff --git a/t/cond8.sh b/t/cond8.sh
index 983e77918..983e77918 100755..100644
--- a/t/cond8.sh
+++ b/t/cond8.sh
diff --git a/t/cond9.sh b/t/cond9.sh
index 4fcb3e47a..4fcb3e47a 100755..100644
--- a/t/cond9.sh
+++ b/t/cond9.sh
diff --git a/t/condd.sh b/t/condd.sh
index 507b21f26..507b21f26 100755..100644
--- a/t/condd.sh
+++ b/t/condd.sh
diff --git a/t/condhook.sh b/t/condhook.sh
index 269b67a2c..269b67a2c 100755..100644
--- a/t/condhook.sh
+++ b/t/condhook.sh
diff --git a/t/condhook2.sh b/t/condhook2.sh
index 4c24599d7..4c24599d7 100755..100644
--- a/t/condhook2.sh
+++ b/t/condhook2.sh
diff --git a/t/condinc.sh b/t/condinc.sh
index 515bfc7f5..515bfc7f5 100755..100644
--- a/t/condinc.sh
+++ b/t/condinc.sh
diff --git a/t/condinc2.sh b/t/condinc2.sh
index b196b41ec..b196b41ec 100755..100644
--- a/t/condinc2.sh
+++ b/t/condinc2.sh
diff --git a/t/condlib.sh b/t/condlib.sh
index 1251225d7..1251225d7 100755..100644
--- a/t/condlib.sh
+++ b/t/condlib.sh
diff --git a/t/condman2.sh b/t/condman2.sh
index 45822b8f8..45822b8f8 100755..100644
--- a/t/condman2.sh
+++ b/t/condman2.sh
diff --git a/t/condman3.sh b/t/condman3.sh
index 247dedf76..247dedf76 100755..100644
--- a/t/condman3.sh
+++ b/t/condman3.sh
diff --git a/t/confdeps.sh b/t/confdeps.sh
index c82a70290..c82a70290 100755..100644
--- a/t/confdeps.sh
+++ b/t/confdeps.sh
diff --git a/t/conff.sh b/t/conff.sh
index 450d7be8c..450d7be8c 100755..100644
--- a/t/conff.sh
+++ b/t/conff.sh
diff --git a/t/conff2.sh b/t/conff2.sh
index 58641760b..58641760b 100755..100644
--- a/t/conff2.sh
+++ b/t/conff2.sh
diff --git a/t/conffile-leading-dot.sh b/t/conffile-leading-dot.sh
index 20a769b27..20a769b27 100755..100644
--- a/t/conffile-leading-dot.sh
+++ b/t/conffile-leading-dot.sh
diff --git a/t/confh-internals.sh b/t/confh-internals.sh
index d8885aad1..d8885aad1 100755..100644
--- a/t/confh-internals.sh
+++ b/t/confh-internals.sh
diff --git a/t/confh-subdir-clean.sh b/t/confh-subdir-clean.sh
index beb6cec80..beb6cec80 100755..100644
--- a/t/confh-subdir-clean.sh
+++ b/t/confh-subdir-clean.sh
diff --git a/t/confh.sh b/t/confh.sh
index 49dc0fbdf..49dc0fbdf 100755..100644
--- a/t/confh.sh
+++ b/t/confh.sh
diff --git a/t/confh4.sh b/t/confh4.sh
index d251ad476..d251ad476 100755..100644
--- a/t/confh4.sh
+++ b/t/confh4.sh
diff --git a/t/confh5.sh b/t/confh5.sh
index dd3ce4ba4..dd3ce4ba4 100755..100644
--- a/t/confh5.sh
+++ b/t/confh5.sh
diff --git a/t/confh6.sh b/t/confh6.sh
index 024dd9b38..024dd9b38 100755..100644
--- a/t/confh6.sh
+++ b/t/confh6.sh
diff --git a/t/confh7.sh b/t/confh7.sh
index 63c987276..63c987276 100755..100644
--- a/t/confh7.sh
+++ b/t/confh7.sh
diff --git a/t/confh8.sh b/t/confh8.sh
index 580bcd3f2..580bcd3f2 100755..100644
--- a/t/confh8.sh
+++ b/t/confh8.sh
diff --git a/t/confincl.sh b/t/confincl.sh
index 216a7b554..216a7b554 100755..100644
--- a/t/confincl.sh
+++ b/t/confincl.sh
diff --git a/t/conflnk.sh b/t/conflnk.sh
index 1d532fc97..1d532fc97 100755..100644
--- a/t/conflnk.sh
+++ b/t/conflnk.sh
diff --git a/t/conflnk2.sh b/t/conflnk2.sh
index 9dfc6797a..9dfc6797a 100755..100644
--- a/t/conflnk2.sh
+++ b/t/conflnk2.sh
diff --git a/t/conflnk3.sh b/t/conflnk3.sh
index ef0cabe39..ef0cabe39 100755..100644
--- a/t/conflnk3.sh
+++ b/t/conflnk3.sh
diff --git a/t/conflnk4.sh b/t/conflnk4.sh
index 1c5a90c05..1c5a90c05 100755..100644
--- a/t/conflnk4.sh
+++ b/t/conflnk4.sh
diff --git a/t/confsub.sh b/t/confsub.sh
index c2fdb2d1f..c2fdb2d1f 100755..100644
--- a/t/confsub.sh
+++ b/t/confsub.sh
diff --git a/t/confvar.sh b/t/confvar.sh
index d269b85c7..d269b85c7 100755..100644
--- a/t/confvar.sh
+++ b/t/confvar.sh
diff --git a/t/confvar2.sh b/t/confvar2.sh
index 6bba225f3..6bba225f3 100755..100644
--- a/t/confvar2.sh
+++ b/t/confvar2.sh
diff --git a/t/copy.sh b/t/copy.sh
index 153419b34..153419b34 100755..100644
--- a/t/copy.sh
+++ b/t/copy.sh
diff --git a/t/cscope.tap b/t/cscope.tap
index 97d5c9ff8..5fc455b7f 100755..100644
--- a/t/cscope.tap
+++ b/t/cscope.tap
@@ -22,10 +22,8 @@ plan_ 18
 
 ocwd=$(pwd) || fatal_ "getting top-level directory"
 
-cat > configure.ac << 'END'
-AC_INIT([cscope-test], [1.0])
-AM_INIT_AUTOMAKE([subdir-objects])
-AC_CONFIG_FILES([Makefile sub/Makefile])
+cat >> configure.ac << 'END'
+AC_CONFIG_FILES([sub/Makefile])
 AC_SUBST([CC],  [who-cares])
 AC_SUBST([CXX], [who-cares])
 AC_SUBST([FC],  [who-cares])
diff --git a/t/cscope2.sh b/t/cscope2.sh
index 44fe99527..44fe99527 100755..100644
--- a/t/cscope2.sh
+++ b/t/cscope2.sh
diff --git a/t/cscope3.sh b/t/cscope3.sh
index 7fa707b5c..7fa707b5c 100755..100644
--- a/t/cscope3.sh
+++ b/t/cscope3.sh
diff --git a/t/ctags.sh b/t/ctags.sh
index f1f1fccdd..f1f1fccdd 100755..100644
--- a/t/ctags.sh
+++ b/t/ctags.sh
diff --git a/t/cxx-demo.sh b/t/cxx-demo.sh
index f6d568d78..f6d568d78 100755..100644
--- a/t/cxx-demo.sh
+++ b/t/cxx-demo.sh
diff --git a/t/cxx-fortran.sh b/t/cxx-fortran.sh
index 64d1ecd49..64d1ecd49 100755..100644
--- a/t/cxx-fortran.sh
+++ b/t/cxx-fortran.sh
diff --git a/t/cxx-lt-demo.sh b/t/cxx-lt-demo.sh
index d44852bab..d44852bab 100755..100644
--- a/t/cxx-lt-demo.sh
+++ b/t/cxx-lt-demo.sh
diff --git a/t/cxx2.sh b/t/cxx2.sh
index e585dc1b7..e585dc1b7 100755..100644
--- a/t/cxx2.sh
+++ b/t/cxx2.sh
diff --git a/t/cxxcpp.sh b/t/cxxcpp.sh
index 3c5e4468a..3c5e4468a 100755..100644
--- a/t/cxxcpp.sh
+++ b/t/cxxcpp.sh
diff --git a/t/cxxlibobj.sh b/t/cxxlibobj.sh
index ba071302c..ba071302c 100755..100644
--- a/t/cxxlibobj.sh
+++ b/t/cxxlibobj.sh
diff --git a/t/cxxlink.sh b/t/cxxlink.sh
index 3d12cb4cd..3d12cb4cd 100755..100644
--- a/t/cxxlink.sh
+++ b/t/cxxlink.sh
diff --git a/t/cygnus-no-more.sh b/t/cygnus-no-more.sh
index db07929c8..db07929c8 100755..100644
--- a/t/cygnus-no-more.sh
+++ b/t/cygnus-no-more.sh
diff --git a/t/cygwin32.sh b/t/cygwin32.sh
index 66cafdf9a..66cafdf9a 100755..100644
--- a/t/cygwin32.sh
+++ b/t/cygwin32.sh
diff --git a/t/dash.sh b/t/dash.sh
index 4d4271283..4d4271283 100755..100644
--- a/t/dash.sh
+++ b/t/dash.sh
diff --git a/t/defun.sh b/t/defun.sh
index c9455e3e7..c9455e3e7 100755..100644
--- a/t/defun.sh
+++ b/t/defun.sh
diff --git a/t/defun2.sh b/t/defun2.sh
index f5e448b60..f5e448b60 100755..100644
--- a/t/defun2.sh
+++ b/t/defun2.sh
diff --git a/t/dejagnu-absolute-builddir.sh b/t/dejagnu-absolute-builddir.sh
index 495721b60..495721b60 100755..100644
--- a/t/dejagnu-absolute-builddir.sh
+++ b/t/dejagnu-absolute-builddir.sh
diff --git a/t/dejagnu-relative-srcdir.sh b/t/dejagnu-relative-srcdir.sh
index 6168421ce..6168421ce 100755..100644
--- a/t/dejagnu-relative-srcdir.sh
+++ b/t/dejagnu-relative-srcdir.sh
diff --git a/t/dejagnu-siteexp-append.sh b/t/dejagnu-siteexp-append.sh
index cb5b499a3..cb5b499a3 100755..100644
--- a/t/dejagnu-siteexp-append.sh
+++ b/t/dejagnu-siteexp-append.sh
diff --git a/t/dejagnu-siteexp-extend.sh b/t/dejagnu-siteexp-extend.sh
index 5b3257512..5b3257512 100755..100644
--- a/t/dejagnu-siteexp-extend.sh
+++ b/t/dejagnu-siteexp-extend.sh
diff --git a/t/dejagnu-siteexp-useredit.sh b/t/dejagnu-siteexp-useredit.sh
index 419acdf58..419acdf58 100755..100644
--- a/t/dejagnu-siteexp-useredit.sh
+++ b/t/dejagnu-siteexp-useredit.sh
diff --git a/t/dejagnu2.sh b/t/dejagnu2.sh
index 0ec545de0..0ec545de0 100755..100644
--- a/t/dejagnu2.sh
+++ b/t/dejagnu2.sh
diff --git a/t/dejagnu3.sh b/t/dejagnu3.sh
index 8aac44f6c..8aac44f6c 100755..100644
--- a/t/dejagnu3.sh
+++ b/t/dejagnu3.sh
diff --git a/t/dejagnu4.sh b/t/dejagnu4.sh
index 00cbe0e6a..00cbe0e6a 100755..100644
--- a/t/dejagnu4.sh
+++ b/t/dejagnu4.sh
diff --git a/t/dejagnu5.sh b/t/dejagnu5.sh
index c665fde33..c665fde33 100755..100644
--- a/t/dejagnu5.sh
+++ b/t/dejagnu5.sh
diff --git a/t/dejagnu6.sh b/t/dejagnu6.sh
index e9c31313e..e9c31313e 100755..100644
--- a/t/dejagnu6.sh
+++ b/t/dejagnu6.sh
diff --git a/t/dejagnu7.sh b/t/dejagnu7.sh
index 9594e0b20..9594e0b20 100755..100644
--- a/t/dejagnu7.sh
+++ b/t/dejagnu7.sh
diff --git a/t/deleted-am.sh b/t/deleted-am.sh
index 78c1ad973..78c1ad973 100755..100644
--- a/t/deleted-am.sh
+++ b/t/deleted-am.sh
diff --git a/t/deleted-m4.sh b/t/deleted-m4.sh
index d11a058b6..d11a058b6 100755..100644
--- a/t/deleted-m4.sh
+++ b/t/deleted-m4.sh
diff --git a/t/depacl2.sh b/t/depacl2.sh
index 4d7912a86..4d7912a86 100755..100644
--- a/t/depacl2.sh
+++ b/t/depacl2.sh
diff --git a/t/depcomp-implicit-auxdir.sh b/t/depcomp-implicit-auxdir.sh
index 20283916f..20283916f 100755..100644
--- a/t/depcomp-implicit-auxdir.sh
+++ b/t/depcomp-implicit-auxdir.sh
diff --git a/t/depcomp-recover.sh b/t/depcomp-recover.sh
index 17f6af448..17f6af448 100755..100644
--- a/t/depcomp-recover.sh
+++ b/t/depcomp-recover.sh
diff --git a/t/depcomp-shuffle-sub-vpath.sh b/t/depcomp-shuffle-sub-vpath.sh
index 5938d271a..5938d271a 100755..100644
--- a/t/depcomp-shuffle-sub-vpath.sh
+++ b/t/depcomp-shuffle-sub-vpath.sh
diff --git a/t/depcomp-shuffle-sub.sh b/t/depcomp-shuffle-sub.sh
index e921c7675..e921c7675 100755..100644
--- a/t/depcomp-shuffle-sub.sh
+++ b/t/depcomp-shuffle-sub.sh
diff --git a/t/depcomp-shuffle-vpath.sh b/t/depcomp-shuffle-vpath.sh
index bcfcf009d..bcfcf009d 100755..100644
--- a/t/depcomp-shuffle-vpath.sh
+++ b/t/depcomp-shuffle-vpath.sh
diff --git a/t/depcomp-shuffle.sh b/t/depcomp-shuffle.sh
index 8054f43ff..8054f43ff 100755..100644
--- a/t/depcomp-shuffle.sh
+++ b/t/depcomp-shuffle.sh
diff --git a/t/depcomp.sh b/t/depcomp.sh
index b5c4d4f2f..b5c4d4f2f 100755..100644
--- a/t/depcomp.sh
+++ b/t/depcomp.sh
diff --git a/t/depcomp2.sh b/t/depcomp2.sh
index 218216477..218216477 100755..100644
--- a/t/depcomp2.sh
+++ b/t/depcomp2.sh
diff --git a/t/depcomp8a.sh b/t/depcomp8a.sh
index 626ab8c89..626ab8c89 100755..100644
--- a/t/depcomp8a.sh
+++ b/t/depcomp8a.sh
diff --git a/t/depcomp8b.sh b/t/depcomp8b.sh
index aa5e705ea..95316a46b 100755..100644
--- a/t/depcomp8b.sh
+++ b/t/depcomp8b.sh
@@ -30,9 +30,6 @@ AC_OUTPUT
 END
 
 cat > Makefile.am << 'END'
-## FIXME: stop disabling the warnings in the 'unsupported' category
-## FIXME: once the 'subdir-objects' option has been mandatory.
-AUTOMAKE_OPTIONS = -Wno-unsupported
 lib_LTLIBRARIES = libzardoz.la
 libzardoz_la_SOURCES = foo.c sub/bar.c
 END
@@ -46,7 +43,7 @@ $ACLOCAL
 $AUTOMAKE -a
 
 grep include Makefile.in # For debugging.
-grep 'include.*\./\$(DEPDIR)/foo\.P' Makefile.in
+LC_ALL=C grep 'include.*\./\$(DEPDIR)/foo\.P' Makefile.in
 LC_ALL=C grep 'include.*[^a-zA-Z0-9_/]sub/\$(DEPDIR)/bar\.P' Makefile.in
 $EGREP 'include.*/(\.|sub)/\$\(DEPDIR\)' Makefile.in && exit 1
 
diff --git a/t/depdist.sh b/t/depdist.sh
index 64d59a663..64d59a663 100755..100644
--- a/t/depdist.sh
+++ b/t/depdist.sh
diff --git a/t/depend.sh b/t/depend.sh
index 126a05f0e..126a05f0e 100755..100644
--- a/t/depend.sh
+++ b/t/depend.sh
diff --git a/t/depend3.sh b/t/depend3.sh
index d757caca7..d757caca7 100755..100644
--- a/t/depend3.sh
+++ b/t/depend3.sh
diff --git a/t/depend4.sh b/t/depend4.sh
index 8af247c76..8af247c76 100755..100644
--- a/t/depend4.sh
+++ b/t/depend4.sh
diff --git a/t/deprecated-acinit.sh b/t/deprecated-acinit.sh
index 223984bad..223984bad 100755..100644
--- a/t/deprecated-acinit.sh
+++ b/t/deprecated-acinit.sh
diff --git a/t/destdir.sh b/t/destdir.sh
index 3a5d0c85d..3a5d0c85d 100755..100644
--- a/t/destdir.sh
+++ b/t/destdir.sh
diff --git a/t/discover.sh b/t/discover.sh
index f841c5ba3..f841c5ba3 100755..100644
--- a/t/discover.sh
+++ b/t/discover.sh
diff --git a/t/dist-auxdir-many-subdirs.sh b/t/dist-auxdir-many-subdirs.sh
index ec1a9641f..ec1a9641f 100755..100644
--- a/t/dist-auxdir-many-subdirs.sh
+++ b/t/dist-auxdir-many-subdirs.sh
diff --git a/t/dist-auxfile-2.sh b/t/dist-auxfile-2.sh
index 973dc7f95..973dc7f95 100755..100644
--- a/t/dist-auxfile-2.sh
+++ b/t/dist-auxfile-2.sh
diff --git a/t/dist-auxfile.sh b/t/dist-auxfile.sh
index fe159cec0..fe159cec0 100755..100644
--- a/t/dist-auxfile.sh
+++ b/t/dist-auxfile.sh
diff --git a/t/dist-formats.tap b/t/dist-formats.tap
index 375a5b602..ac0410e5c 100755..100644
--- a/t/dist-formats.tap
+++ b/t/dist-formats.tap
@@ -25,7 +25,7 @@ plan_ 18
 #  Auxiliary subroutines and variables.  #
 # -------------------------------------- #
 
-TAR='' && unset TAR
+unset TAR
 
 # Set variables '$compressor' and '$suffix'.
 setup_vars_for_compression_format ()
diff --git a/t/dist-included-parent-dir.sh b/t/dist-included-parent-dir.sh
index bd411cb91..bd411cb91 100755..100644
--- a/t/dist-included-parent-dir.sh
+++ b/t/dist-included-parent-dir.sh
diff --git a/t/dist-many.sh b/t/dist-many.sh
index e9c9af920..e9c9af920 100755..100644
--- a/t/dist-many.sh
+++ b/t/dist-many.sh
diff --git a/t/dist-many2.sh b/t/dist-many2.sh
index 31a0688c9..31a0688c9 100755..100644
--- a/t/dist-many2.sh
+++ b/t/dist-many2.sh
diff --git a/t/dist-missing-am.sh b/t/dist-missing-am.sh
index 57d5fb08e..57d5fb08e 100755..100644
--- a/t/dist-missing-am.sh
+++ b/t/dist-missing-am.sh
diff --git a/t/dist-missing-included-m4.sh b/t/dist-missing-included-m4.sh
index fa185458f..fa185458f 100755..100644
--- a/t/dist-missing-included-m4.sh
+++ b/t/dist-missing-included-m4.sh
diff --git a/t/dist-missing-m4.sh b/t/dist-missing-m4.sh
index 4d874467c..4d874467c 100755..100644
--- a/t/dist-missing-m4.sh
+++ b/t/dist-missing-m4.sh
diff --git a/t/dist-obsolete-opts.sh b/t/dist-obsolete-opts.sh
index 0e263e3e0..0e263e3e0 100755..100644
--- a/t/dist-obsolete-opts.sh
+++ b/t/dist-obsolete-opts.sh
diff --git a/t/dist-pr109765.sh b/t/dist-pr109765.sh
index 2051f5f4e..2051f5f4e 100755..100644
--- a/t/dist-pr109765.sh
+++ b/t/dist-pr109765.sh
diff --git a/t/dist-readonly.sh b/t/dist-readonly.sh
index f68bcf89a..f68bcf89a 100755..100644
--- a/t/dist-readonly.sh
+++ b/t/dist-readonly.sh
diff --git a/t/dist-repeated.sh b/t/dist-repeated.sh
index c4a2e0300..c4a2e0300 100755..100644
--- a/t/dist-repeated.sh
+++ b/t/dist-repeated.sh
diff --git a/t/dist-srcdir.sh b/t/dist-srcdir.sh
index 457cb22b1..457cb22b1 100755..100644
--- a/t/dist-srcdir.sh
+++ b/t/dist-srcdir.sh
diff --git a/t/dist-srcdir2.sh b/t/dist-srcdir2.sh
index 9af4d94d6..9af4d94d6 100755..100644
--- a/t/dist-srcdir2.sh
+++ b/t/dist-srcdir2.sh
diff --git a/t/distcheck-configure-flags-am.sh b/t/distcheck-configure-flags-am.sh
index a06dd6e07..4f8043c85 100755..100644
--- a/t/distcheck-configure-flags-am.sh
+++ b/t/distcheck-configure-flags-am.sh
@@ -27,7 +27,7 @@ AS_IF([test $success = yes && test "$sentence" = 'it works :-)'],
 AC_OUTPUT
 END
 
-unset sentence || :
+unset sentence
 
 cat > Makefile.am << 'END'
 AM_DISTCHECK_CONFIGURE_FLAGS = $(dc_flags1) $(dc_flags2)
diff --git a/t/distcheck-configure-flags-subpkg.sh b/t/distcheck-configure-flags-subpkg.sh
index 70bb05c1a..70bb05c1a 100755..100644
--- a/t/distcheck-configure-flags-subpkg.sh
+++ b/t/distcheck-configure-flags-subpkg.sh
diff --git a/t/distcheck-configure-flags.sh b/t/distcheck-configure-flags.sh
index 1d0a84027..2a039ab23 100755..100644
--- a/t/distcheck-configure-flags.sh
+++ b/t/distcheck-configure-flags.sh
@@ -26,7 +26,7 @@ AS_IF([test $success = yes && test "$sentence" = 'it works :-)'],
 AC_OUTPUT
 END
 
-unset sentence || :
+unset sentence
 
 : > Makefile.am
 
diff --git a/t/distcheck-hook.sh b/t/distcheck-hook.sh
index a9e85523e..a9e85523e 100755..100644
--- a/t/distcheck-hook.sh
+++ b/t/distcheck-hook.sh
diff --git a/t/distcheck-hook2.sh b/t/distcheck-hook2.sh
index 1d4938fcf..1d4938fcf 100755..100644
--- a/t/distcheck-hook2.sh
+++ b/t/distcheck-hook2.sh
diff --git a/t/distcheck-missing-m4.sh b/t/distcheck-missing-m4.sh
index 34260c4be..34260c4be 100755..100644
--- a/t/distcheck-missing-m4.sh
+++ b/t/distcheck-missing-m4.sh
diff --git a/t/distcheck-outdated-m4.sh b/t/distcheck-outdated-m4.sh
index d7b05c103..d7b05c103 100755..100644
--- a/t/distcheck-outdated-m4.sh
+++ b/t/distcheck-outdated-m4.sh
diff --git a/t/distcheck-override-infodir.sh b/t/distcheck-override-infodir.sh
index e35225df8..e35225df8 100755..100644
--- a/t/distcheck-override-infodir.sh
+++ b/t/distcheck-override-infodir.sh
diff --git a/t/distcheck-pr10470.sh b/t/distcheck-pr10470.sh
index 466032c70..466032c70 100755..100644
--- a/t/distcheck-pr10470.sh
+++ b/t/distcheck-pr10470.sh
diff --git a/t/distcheck-pr9579.sh b/t/distcheck-pr9579.sh
index 52302d251..52302d251 100755..100644
--- a/t/distcheck-pr9579.sh
+++ b/t/distcheck-pr9579.sh
diff --git a/t/distcheck-writable-srcdir.sh b/t/distcheck-writable-srcdir.sh
index 2c570ecc2..2c570ecc2 100755..100644
--- a/t/distcheck-writable-srcdir.sh
+++ b/t/distcheck-writable-srcdir.sh
diff --git a/t/distcleancheck.sh b/t/distcleancheck.sh
index 5e5bb9e8e..5e5bb9e8e 100755..100644
--- a/t/distcleancheck.sh
+++ b/t/distcleancheck.sh
diff --git a/t/distcom-subdir.sh b/t/distcom-subdir.sh
index 248017d7b..248017d7b 100755..100644
--- a/t/distcom-subdir.sh
+++ b/t/distcom-subdir.sh
diff --git a/t/distcom3.sh b/t/distcom3.sh
index 1700608cd..1700608cd 100755..100644
--- a/t/distcom3.sh
+++ b/t/distcom3.sh
diff --git a/t/distcom4.sh b/t/distcom4.sh
index 58f84b4f7..58f84b4f7 100755..100644
--- a/t/distcom4.sh
+++ b/t/distcom4.sh
diff --git a/t/distcom5.sh b/t/distcom5.sh
index b57210b33..b57210b33 100755..100644
--- a/t/distcom5.sh
+++ b/t/distcom5.sh
diff --git a/t/distdir.sh b/t/distdir.sh
index 1655aabfa..1655aabfa 100755..100644
--- a/t/distdir.sh
+++ b/t/distdir.sh
diff --git a/t/disthook.sh b/t/disthook.sh
index f1ff37123..f1ff37123 100755..100644
--- a/t/disthook.sh
+++ b/t/disthook.sh
diff --git a/t/distlinks.sh b/t/distlinks.sh
index 48387bbaf..48387bbaf 100755..100644
--- a/t/distlinks.sh
+++ b/t/distlinks.sh
diff --git a/t/distlinksbrk.sh b/t/distlinksbrk.sh
index 8774c20c0..8774c20c0 100755..100644
--- a/t/distlinksbrk.sh
+++ b/t/distlinksbrk.sh
diff --git a/t/distname.sh b/t/distname.sh
index d4d04bda2..d4d04bda2 100755..100644
--- a/t/distname.sh
+++ b/t/distname.sh
diff --git a/t/dmalloc.sh b/t/dmalloc.sh
index bd9093f67..bd9093f67 100755..100644
--- a/t/dmalloc.sh
+++ b/t/dmalloc.sh
diff --git a/t/dollar.sh b/t/dollar.sh
index 1a3b6c553..1a3b6c553 100755..100644
--- a/t/dollar.sh
+++ b/t/dollar.sh
diff --git a/t/double-colon-rules.sh b/t/double-colon-rules.sh
index 071765fef..071765fef 100755..100644
--- a/t/double-colon-rules.sh
+++ b/t/double-colon-rules.sh
diff --git a/t/double.sh b/t/double.sh
index 62ddca44e..62ddca44e 100755..100644
--- a/t/double.sh
+++ b/t/double.sh
diff --git a/t/dup2.sh b/t/dup2.sh
index e5592081c..e5592081c 100755..100644
--- a/t/dup2.sh
+++ b/t/dup2.sh
diff --git a/t/else.sh b/t/else.sh
index c9fdaf13e..c9fdaf13e 100755..100644
--- a/t/else.sh
+++ b/t/else.sh
diff --git a/t/empty-data-primary.sh b/t/empty-data-primary.sh
index 516fe9897..516fe9897 100755..100644
--- a/t/empty-data-primary.sh
+++ b/t/empty-data-primary.sh
diff --git a/t/empty-sources-primary.tap b/t/empty-sources-primary.tap
index dbf557c38..dbf557c38 100755..100644
--- a/t/empty-sources-primary.tap
+++ b/t/empty-sources-primary.tap
diff --git a/t/ensure-dir-exists.sh b/t/ensure-dir-exists.sh
index 659ef7e23..659ef7e23 100755..100644
--- a/t/ensure-dir-exists.sh
+++ b/t/ensure-dir-exists.sh
diff --git a/t/etags.sh b/t/etags.sh
index 6577419d2..6577419d2 100755..100644
--- a/t/etags.sh
+++ b/t/etags.sh
diff --git a/t/exdir.sh b/t/exdir.sh
index 75c504a3c..75c504a3c 100755..100644
--- a/t/exdir.sh
+++ b/t/exdir.sh
diff --git a/t/exdir2.sh b/t/exdir2.sh
index e790ab5c3..e790ab5c3 100755..100644
--- a/t/exdir2.sh
+++ b/t/exdir2.sh
diff --git a/t/exdir3.sh b/t/exdir3.sh
index 723c0efd8..723c0efd8 100755..100644
--- a/t/exdir3.sh
+++ b/t/exdir3.sh
diff --git a/t/exeext.sh b/t/exeext.sh
index 9e0526654..9e0526654 100755..100644
--- a/t/exeext.sh
+++ b/t/exeext.sh
diff --git a/t/exeext2.sh b/t/exeext2.sh
index a282d823c..a282d823c 100755..100644
--- a/t/exeext2.sh
+++ b/t/exeext2.sh
diff --git a/t/exeext3.sh b/t/exeext3.sh
index d09e60135..d09e60135 100755..100644
--- a/t/exeext3.sh
+++ b/t/exeext3.sh
diff --git a/t/exeext4.sh b/t/exeext4.sh
index 66deef282..66deef282 100755..100644
--- a/t/exeext4.sh
+++ b/t/exeext4.sh
diff --git a/t/exsource.sh b/t/exsource.sh
index ffc1e434b..ffc1e434b 100755..100644
--- a/t/exsource.sh
+++ b/t/exsource.sh
diff --git a/t/ext.sh b/t/ext.sh
index aa030119d..aa030119d 100755..100644
--- a/t/ext.sh
+++ b/t/ext.sh
diff --git a/t/ext2.sh b/t/ext2.sh
index 0cc916862..0cc916862 100755..100644
--- a/t/ext2.sh
+++ b/t/ext2.sh
diff --git a/t/extra-data.sh b/t/extra-data.sh
index cded2a3c7..cded2a3c7 100755..100644
--- a/t/extra-data.sh
+++ b/t/extra-data.sh
diff --git a/t/extra-deps-lt.sh b/t/extra-deps-lt.sh
index 8d4af4437..8d4af4437 100755..100644
--- a/t/extra-deps-lt.sh
+++ b/t/extra-deps-lt.sh
diff --git a/t/extra-deps.sh b/t/extra-deps.sh
index 3bd6d1d03..3bd6d1d03 100755..100644
--- a/t/extra-deps.sh
+++ b/t/extra-deps.sh
diff --git a/t/extra-dist-dirs-and-subdirs.sh b/t/extra-dist-dirs-and-subdirs.sh
index 48798d1a2..48798d1a2 100755..100644
--- a/t/extra-dist-dirs-and-subdirs.sh
+++ b/t/extra-dist-dirs-and-subdirs.sh
diff --git a/t/extra-dist-vpath-dir-merge.sh b/t/extra-dist-vpath-dir-merge.sh
index e897dcb59..e897dcb59 100755..100644
--- a/t/extra-dist-vpath-dir-merge.sh
+++ b/t/extra-dist-vpath-dir-merge.sh
diff --git a/t/extra-dist-vpath-dir.sh b/t/extra-dist-vpath-dir.sh
index b4d4e884b..b4d4e884b 100755..100644
--- a/t/extra-dist-vpath-dir.sh
+++ b/t/extra-dist-vpath-dir.sh
diff --git a/t/extra-dist-wildcards-gnu.sh b/t/extra-dist-wildcards-gnu.sh
index d1f264d3a..d1f264d3a 100755..100644
--- a/t/extra-dist-wildcards-gnu.sh
+++ b/t/extra-dist-wildcards-gnu.sh
diff --git a/t/extra-dist-wildcards-vpath.sh b/t/extra-dist-wildcards-vpath.sh
index 156e1d14c..156e1d14c 100755..100644
--- a/t/extra-dist-wildcards-vpath.sh
+++ b/t/extra-dist-wildcards-vpath.sh
diff --git a/t/extra-dist-wildcards.sh b/t/extra-dist-wildcards.sh
index b669717d2..b669717d2 100755..100644
--- a/t/extra-dist-wildcards.sh
+++ b/t/extra-dist-wildcards.sh
diff --git a/t/extra-portability.sh b/t/extra-portability.sh
index ec983fdda..ec983fdda 100755..100644
--- a/t/extra-portability.sh
+++ b/t/extra-portability.sh
diff --git a/t/extra-portability2.sh b/t/extra-portability2.sh
index 8e6477f03..8e6477f03 100755..100644
--- a/t/extra-portability2.sh
+++ b/t/extra-portability2.sh
diff --git a/t/extra-programs-and-libs.sh b/t/extra-programs-and-libs.sh
index 53dede05e..53dede05e 100755..100644
--- a/t/extra-programs-and-libs.sh
+++ b/t/extra-programs-and-libs.sh
diff --git a/t/extra-programs-empty.sh b/t/extra-programs-empty.sh
index 4e3588991..4e3588991 100755..100644
--- a/t/extra-programs-empty.sh
+++ b/t/extra-programs-empty.sh
diff --git a/t/extra-programs-misc.sh b/t/extra-programs-misc.sh
index 38b6bdd66..38b6bdd66 100755..100644
--- a/t/extra-programs-misc.sh
+++ b/t/extra-programs-misc.sh
diff --git a/t/extra.sh b/t/extra.sh
index f041011d0..f041011d0 100755..100644
--- a/t/extra.sh
+++ b/t/extra.sh
diff --git a/t/extra2.sh b/t/extra2.sh
index f3c3f5bdb..f3c3f5bdb 100755..100644
--- a/t/extra2.sh
+++ b/t/extra2.sh
diff --git a/t/f90only.sh b/t/f90only.sh
index 0ad4ff826..0ad4ff826 100755..100644
--- a/t/f90only.sh
+++ b/t/f90only.sh
diff --git a/t/flavor.sh b/t/flavor.sh
index 9c719935b..9c719935b 100755..100644
--- a/t/flavor.sh
+++ b/t/flavor.sh
diff --git a/t/flibs.sh b/t/flibs.sh
index 80d2be1c4..80d2be1c4 100755..100644
--- a/t/flibs.sh
+++ b/t/flibs.sh
diff --git a/t/fn99.sh b/t/fn99.sh
index e98d0fd03..e98d0fd03 100755..100644
--- a/t/fn99.sh
+++ b/t/fn99.sh
diff --git a/t/fn99subdir.sh b/t/fn99subdir.sh
index 9ef09eff4..9ef09eff4 100755..100644
--- a/t/fn99subdir.sh
+++ b/t/fn99subdir.sh
diff --git a/t/fonly.sh b/t/fonly.sh
index 275b2d257..275b2d257 100755..100644
--- a/t/fonly.sh
+++ b/t/fonly.sh
diff --git a/t/forcemiss.sh b/t/forcemiss.sh
index 7abfb55d6..7abfb55d6 100755..100644
--- a/t/forcemiss.sh
+++ b/t/forcemiss.sh
diff --git a/t/forcemiss2.sh b/t/forcemiss2.sh
index 9a6a0e22c..9a6a0e22c 100755..100644
--- a/t/forcemiss2.sh
+++ b/t/forcemiss2.sh
diff --git a/t/fort1.sh b/t/fort1.sh
index 68010b252..68010b252 100755..100644
--- a/t/fort1.sh
+++ b/t/fort1.sh
diff --git a/t/fort2.sh b/t/fort2.sh
index 3a62237c3..9e87b5c5e 100755..100644
--- a/t/fort2.sh
+++ b/t/fort2.sh
@@ -70,8 +70,17 @@ $MAKE -n \
   FCFLAGS_f90=--@90 FCFLAGS_f95=--@95 FCFLAGS_f03=--@03 FCFLAGS_f08=--@08 \
   > stdout || { cat stdout; exit 1; }
 cat stdout
-# To make it easier to have  stricter grepping below.
-sed -e 's/[ 	][ 	]*/  /g' -e 's/^/ /' -e 's/$/ /' stdout > out
+# To make it easier to have stricter grepping below.
+$PERL -e '
+  undef $/;
+  $_ = <>;
+  s/[^\\]\\\n/ /g;
+  s/^/ /;
+  s/\n/ \n /g;
+  s/[ \t]+/  /g;
+  s/\n\s*\z/\n/;
+  print;
+' <stdout >out
 cat out
 
 grep ' fake-fc .* --@90 .* hello\.f90 ' out
diff --git a/t/fort4.sh b/t/fort4.sh
index 2d01ee46d..2d01ee46d 100755..100644
--- a/t/fort4.sh
+++ b/t/fort4.sh
diff --git a/t/fort5.sh b/t/fort5.sh
index d090f6ffd..d090f6ffd 100755..100644
--- a/t/fort5.sh
+++ b/t/fort5.sh
diff --git a/t/fortdep.sh b/t/fortdep.sh
index 59c9b9d1f..59c9b9d1f 100755..100644
--- a/t/fortdep.sh
+++ b/t/fortdep.sh
diff --git a/t/gcj.sh b/t/gcj.sh
index d0f2f4120..d0f2f4120 100755..100644
--- a/t/gcj.sh
+++ b/t/gcj.sh
diff --git a/t/gcj2.sh b/t/gcj2.sh
index 9f099255f..9f099255f 100755..100644
--- a/t/gcj2.sh
+++ b/t/gcj2.sh
diff --git a/t/gcj3.sh b/t/gcj3.sh
index 8e7c763e5..8e7c763e5 100755..100644
--- a/t/gcj3.sh
+++ b/t/gcj3.sh
diff --git a/t/gcj4.sh b/t/gcj4.sh
index 39fe5297d..39fe5297d 100755..100644
--- a/t/gcj4.sh
+++ b/t/gcj4.sh
diff --git a/t/gcj5.sh b/t/gcj5.sh
index 17f8f2921..17f8f2921 100755..100644
--- a/t/gcj5.sh
+++ b/t/gcj5.sh
diff --git a/t/gcj6.sh b/t/gcj6.sh
index bba61d1cc..bba61d1cc 100755..100644
--- a/t/gcj6.sh
+++ b/t/gcj6.sh
diff --git a/t/get-sysconf.sh b/t/get-sysconf.sh
index bd4932f4c..bd4932f4c 100755..100644
--- a/t/get-sysconf.sh
+++ b/t/get-sysconf.sh
diff --git a/t/gettext-config-rpath.sh b/t/gettext-config-rpath.sh
index d99e36184..d99e36184 100755..100644
--- a/t/gettext-config-rpath.sh
+++ b/t/gettext-config-rpath.sh
diff --git a/t/gettext-macros.sh b/t/gettext-macros.sh
index 5a9324012..5a9324012 100755..100644
--- a/t/gettext-macros.sh
+++ b/t/gettext-macros.sh
diff --git a/t/gettext-pr381.sh b/t/gettext-pr381.sh
index ebf047d7c..ebf047d7c 100755..100644
--- a/t/gettext-pr381.sh
+++ b/t/gettext-pr381.sh
diff --git a/t/gettext.sh b/t/gettext.sh
index 26f48257d..26f48257d 100755..100644
--- a/t/gettext.sh
+++ b/t/gettext.sh
diff --git a/t/gettext2.sh b/t/gettext2.sh
index 48ea39713..48ea39713 100755..100644
--- a/t/gettext2.sh
+++ b/t/gettext2.sh
diff --git a/t/gettext3.sh b/t/gettext3.sh
index 28b26a0cd..28b26a0cd 100755..100644
--- a/t/gettext3.sh
+++ b/t/gettext3.sh
diff --git a/t/gmake-vars.sh b/t/gmake-vars.sh
index a84f05982..a84f05982 100755..100644
--- a/t/gmake-vars.sh
+++ b/t/gmake-vars.sh
diff --git a/t/gnits.sh b/t/gnits.sh
index 45530d89e..45530d89e 100755..100644
--- a/t/gnits.sh
+++ b/t/gnits.sh
diff --git a/t/gnits2.sh b/t/gnits2.sh
index 488955d2b..488955d2b 100755..100644
--- a/t/gnits2.sh
+++ b/t/gnits2.sh
diff --git a/t/gnits3.sh b/t/gnits3.sh
index 263e4b455..263e4b455 100755..100644
--- a/t/gnits3.sh
+++ b/t/gnits3.sh
diff --git a/t/gnumake.sh b/t/gnumake.sh
index 9102a2a31..9102a2a31 100755..100644
--- a/t/gnumake.sh
+++ b/t/gnumake.sh
diff --git a/t/gnuwarn.sh b/t/gnuwarn.sh
index ad1a8a4cd..ad1a8a4cd 100755..100644
--- a/t/gnuwarn.sh
+++ b/t/gnuwarn.sh
diff --git a/t/gnuwarn2.sh b/t/gnuwarn2.sh
index d269fb7ec..d269fb7ec 100755..100644
--- a/t/gnuwarn2.sh
+++ b/t/gnuwarn2.sh
diff --git a/t/hdr-vars-defined-once.sh b/t/hdr-vars-defined-once.sh
index 4defe8619..4defe8619 100755..100644
--- a/t/hdr-vars-defined-once.sh
+++ b/t/hdr-vars-defined-once.sh
diff --git a/t/header.sh b/t/header.sh
index b1045d9ff..b1045d9ff 100755..100644
--- a/t/header.sh
+++ b/t/header.sh
diff --git a/t/help-depend.sh b/t/help-depend.sh
index a0e2bc6e3..a0e2bc6e3 100755..100644
--- a/t/help-depend.sh
+++ b/t/help-depend.sh
diff --git a/t/help-depend2.sh b/t/help-depend2.sh
index 14564dd37..14564dd37 100755..100644
--- a/t/help-depend2.sh
+++ b/t/help-depend2.sh
diff --git a/t/help-dmalloc.sh b/t/help-dmalloc.sh
index 6795a140a..6795a140a 100755..100644
--- a/t/help-dmalloc.sh
+++ b/t/help-dmalloc.sh
diff --git a/t/help-init.sh b/t/help-init.sh
index 1d69e914a..1d69e914a 100755..100644
--- a/t/help-init.sh
+++ b/t/help-init.sh
diff --git a/t/help-lispdir.sh b/t/help-lispdir.sh
index 983531238..983531238 100755..100644
--- a/t/help-lispdir.sh
+++ b/t/help-lispdir.sh
diff --git a/t/help-python.sh b/t/help-python.sh
index 996f9160e..996f9160e 100755..100644
--- a/t/help-python.sh
+++ b/t/help-python.sh
diff --git a/t/help-silent.sh b/t/help-silent.sh
index c7f1e2042..c7f1e2042 100755..100644
--- a/t/help-silent.sh
+++ b/t/help-silent.sh
diff --git a/t/help-upc.sh b/t/help-upc.sh
index 9e11e59e6..9e11e59e6 100755..100644
--- a/t/help-upc.sh
+++ b/t/help-upc.sh
diff --git a/t/help.sh b/t/help.sh
index 85a0a1ae6..85a0a1ae6 100755..100644
--- a/t/help.sh
+++ b/t/help.sh
diff --git a/t/help2.sh b/t/help2.sh
index b49d49e12..b49d49e12 100755..100644
--- a/t/help2.sh
+++ b/t/help2.sh
diff --git a/t/help3.sh b/t/help3.sh
index 3963a1f9c..3963a1f9c 100755..100644
--- a/t/help3.sh
+++ b/t/help3.sh
diff --git a/t/help4.sh b/t/help4.sh
index d0e7313f2..d0e7313f2 100755..100644
--- a/t/help4.sh
+++ b/t/help4.sh
diff --git a/t/hfs.sh b/t/hfs.sh
index 650a1a36e..650a1a36e 100755..100644
--- a/t/hfs.sh
+++ b/t/hfs.sh
diff --git a/t/implicit.sh b/t/implicit.sh
index 1ccb68811..1ccb68811 100755..100644
--- a/t/implicit.sh
+++ b/t/implicit.sh
diff --git a/t/includes-deprecation.sh b/t/includes-deprecation.sh
index ec54359ae..ec54359ae 100755..100644
--- a/t/includes-deprecation.sh
+++ b/t/includes-deprecation.sh
diff --git a/t/init.sh b/t/init.sh
index 2cd4e8e9d..2cd4e8e9d 100755..100644
--- a/t/init.sh
+++ b/t/init.sh
diff --git a/t/init2.sh b/t/init2.sh
index 1d8a8038c..1d8a8038c 100755..100644
--- a/t/init2.sh
+++ b/t/init2.sh
diff --git a/t/insh2.sh b/t/insh2.sh
index 26b6bce51..26b6bce51 100755..100644
--- a/t/insh2.sh
+++ b/t/insh2.sh
diff --git a/t/install-info-dir.sh b/t/install-info-dir.sh
index 8bb740161..8bb740161 100755..100644
--- a/t/install-info-dir.sh
+++ b/t/install-info-dir.sh
diff --git a/t/install2.sh b/t/install2.sh
index 67dd3d4d6..67dd3d4d6 100755..100644
--- a/t/install2.sh
+++ b/t/install2.sh
diff --git a/t/installdir.sh b/t/installdir.sh
index 883593dd8..883593dd8 100755..100644
--- a/t/installdir.sh
+++ b/t/installdir.sh
diff --git a/t/instdat.sh b/t/instdat.sh
index e030b904c..e030b904c 100755..100644
--- a/t/instdat.sh
+++ b/t/instdat.sh
diff --git a/t/instdat2.sh b/t/instdat2.sh
index 1a55e8e62..1a55e8e62 100755..100644
--- a/t/instdat2.sh
+++ b/t/instdat2.sh
diff --git a/t/instdir-cond.sh b/t/instdir-cond.sh
index 182226269..182226269 100755..100644
--- a/t/instdir-cond.sh
+++ b/t/instdir-cond.sh
diff --git a/t/instdir-cond2.sh b/t/instdir-cond2.sh
index cf22a6c92..cf22a6c92 100755..100644
--- a/t/instdir-cond2.sh
+++ b/t/instdir-cond2.sh
diff --git a/t/instdir-java.sh b/t/instdir-java.sh
index 794be3a6d..794be3a6d 100755..100644
--- a/t/instdir-java.sh
+++ b/t/instdir-java.sh
diff --git a/t/instdir-lisp.sh b/t/instdir-lisp.sh
index 4e3dbf0db..4e3dbf0db 100755..100644
--- a/t/instdir-lisp.sh
+++ b/t/instdir-lisp.sh
diff --git a/t/instdir-ltlib.sh b/t/instdir-ltlib.sh
index 6a4911f88..6a4911f88 100755..100644
--- a/t/instdir-ltlib.sh
+++ b/t/instdir-ltlib.sh
diff --git a/t/instdir-no-empty.sh b/t/instdir-no-empty.sh
index e569826da..e569826da 100755..100644
--- a/t/instdir-no-empty.sh
+++ b/t/instdir-no-empty.sh
diff --git a/t/instdir-prog.sh b/t/instdir-prog.sh
index 0286f7e34..0286f7e34 100755..100644
--- a/t/instdir-prog.sh
+++ b/t/instdir-prog.sh
diff --git a/t/instdir-python.sh b/t/instdir-python.sh
index 54534098d..54534098d 100755..100644
--- a/t/instdir-python.sh
+++ b/t/instdir-python.sh
diff --git a/t/instdir-texi.sh b/t/instdir-texi.sh
index 1319fddea..1319fddea 100755..100644
--- a/t/instdir-texi.sh
+++ b/t/instdir-texi.sh
diff --git a/t/instdir.sh b/t/instdir.sh
index 2c91d54b6..2c91d54b6 100755..100644
--- a/t/instdir.sh
+++ b/t/instdir.sh
diff --git a/t/instdir2.sh b/t/instdir2.sh
index a3ef25db4..a3ef25db4 100755..100644
--- a/t/instdir2.sh
+++ b/t/instdir2.sh
diff --git a/t/instfail-info.sh b/t/instfail-info.sh
index c699193ea..c699193ea 100755..100644
--- a/t/instfail-info.sh
+++ b/t/instfail-info.sh
diff --git a/t/instfail-java.sh b/t/instfail-java.sh
index 3d974a696..3d974a696 100755..100644
--- a/t/instfail-java.sh
+++ b/t/instfail-java.sh
diff --git a/t/instfail-libtool.sh b/t/instfail-libtool.sh
index 59167c98c..59167c98c 100755..100644
--- a/t/instfail-libtool.sh
+++ b/t/instfail-libtool.sh
diff --git a/t/instfail.sh b/t/instfail.sh
index 7a8f1f21e..7a8f1f21e 100755..100644
--- a/t/instfail.sh
+++ b/t/instfail.sh
diff --git a/t/insthook.sh b/t/insthook.sh
index 1a9182676..1a9182676 100755..100644
--- a/t/insthook.sh
+++ b/t/insthook.sh
diff --git a/t/instman.sh b/t/instman.sh
index d11785657..d11785657 100755..100644
--- a/t/instman.sh
+++ b/t/instman.sh
diff --git a/t/instmany-mans.sh b/t/instmany-mans.sh
index d8c921002..d8c921002 100755..100644
--- a/t/instmany-mans.sh
+++ b/t/instmany-mans.sh
diff --git a/t/instmany-python.sh b/t/instmany-python.sh
index 7fa5ea6b6..7fa5ea6b6 100755..100644
--- a/t/instmany-python.sh
+++ b/t/instmany-python.sh
diff --git a/t/instmany.sh b/t/instmany.sh
index af6142fc8..af6142fc8 100755..100644
--- a/t/instmany.sh
+++ b/t/instmany.sh
diff --git a/t/instsh.sh b/t/instsh.sh
index 3d84245c9..3d84245c9 100755..100644
--- a/t/instsh.sh
+++ b/t/instsh.sh
diff --git a/t/instsh2.sh b/t/instsh2.sh
index 8a60d7435..8a60d7435 100755..100644
--- a/t/instsh2.sh
+++ b/t/instsh2.sh
diff --git a/t/instsh3.sh b/t/instsh3.sh
index d69f225d0..d69f225d0 100755..100644
--- a/t/instsh3.sh
+++ b/t/instsh3.sh
diff --git a/t/instspc.tap b/t/instspc.tap
index e68443ef8..e68443ef8 100755..100644
--- a/t/instspc.tap
+++ b/t/instspc.tap
diff --git a/t/internals.tap b/t/internals.tap
index d6f7e53e8..d6f7e53e8 100755..100644
--- a/t/internals.tap
+++ b/t/internals.tap
diff --git a/t/interp.sh b/t/interp.sh
index d6419ddd7..d6419ddd7 100755..100644
--- a/t/interp.sh
+++ b/t/interp.sh
diff --git a/t/interp2.sh b/t/interp2.sh
index e10ad13c3..e10ad13c3 100755..100644
--- a/t/interp2.sh
+++ b/t/interp2.sh
diff --git a/t/interp3.sh b/t/interp3.sh
index abdab3fbe..abdab3fbe 100755..100644
--- a/t/interp3.sh
+++ b/t/interp3.sh
diff --git a/t/java-check.sh b/t/java-check.sh
index e359c426b..e359c426b 100755..100644
--- a/t/java-check.sh
+++ b/t/java-check.sh
diff --git a/t/java-clean.sh b/t/java-clean.sh
index d57300186..d57300186 100755..100644
--- a/t/java-clean.sh
+++ b/t/java-clean.sh
diff --git a/t/java-compile-install.sh b/t/java-compile-install.sh
index 22952f513..22952f513 100755..100644
--- a/t/java-compile-install.sh
+++ b/t/java-compile-install.sh
diff --git a/t/java-compile-run-flat.sh b/t/java-compile-run-flat.sh
index cb87dd734..cb87dd734 100755..100644
--- a/t/java-compile-run-flat.sh
+++ b/t/java-compile-run-flat.sh
diff --git a/t/java-compile-run-nested.sh b/t/java-compile-run-nested.sh
index 203391836..203391836 100755..100644
--- a/t/java-compile-run-nested.sh
+++ b/t/java-compile-run-nested.sh
diff --git a/t/java-empty-classpath.sh b/t/java-empty-classpath.sh
index 387c4c3d0..cc3dae3ba 100755..100644
--- a/t/java-empty-classpath.sh
+++ b/t/java-empty-classpath.sh
@@ -74,7 +74,7 @@ $AUTOCONF
 $AUTOMAKE
 ./configure
 
-unset CLASSPATH || :
+unset CLASSPATH
 $MAKE
 $MAKE clean
 
@@ -82,7 +82,7 @@ CLASSPATH=''; export CLASSPATH
 $MAKE
 $MAKE clean
 
-unset CLASSPATH || :
+unset CLASSPATH
 $MAKE distcheck
 
 :
diff --git a/t/java-extra.sh b/t/java-extra.sh
index 18ad7c5e5..18ad7c5e5 100755..100644
--- a/t/java-extra.sh
+++ b/t/java-extra.sh
diff --git a/t/java-mix.sh b/t/java-mix.sh
index 9cb04d261..9cb04d261 100755..100644
--- a/t/java-mix.sh
+++ b/t/java-mix.sh
diff --git a/t/java-no-duplicate.sh b/t/java-no-duplicate.sh
index 59b64a3f8..59b64a3f8 100755..100644
--- a/t/java-no-duplicate.sh
+++ b/t/java-no-duplicate.sh
diff --git a/t/java-nobase.sh b/t/java-nobase.sh
index 365246aba..365246aba 100755..100644
--- a/t/java-nobase.sh
+++ b/t/java-nobase.sh
diff --git a/t/java-noinst.sh b/t/java-noinst.sh
index ce36661d4..ce36661d4 100755..100644
--- a/t/java-noinst.sh
+++ b/t/java-noinst.sh
diff --git a/t/java-rebuild.sh b/t/java-rebuild.sh
index 6133a76ac..6133a76ac 100755..100644
--- a/t/java-rebuild.sh
+++ b/t/java-rebuild.sh
diff --git a/t/java-sources.sh b/t/java-sources.sh
index e42daa276..e42daa276 100755..100644
--- a/t/java-sources.sh
+++ b/t/java-sources.sh
diff --git a/t/java-uninstall.sh b/t/java-uninstall.sh
index 92b5eb279..92b5eb279 100755..100644
--- a/t/java-uninstall.sh
+++ b/t/java-uninstall.sh
diff --git a/t/java.sh b/t/java.sh
index 2ff2aa5c0..2ff2aa5c0 100755..100644
--- a/t/java.sh
+++ b/t/java.sh
diff --git a/t/java2.sh b/t/java2.sh
index 1d126904a..1d126904a 100755..100644
--- a/t/java2.sh
+++ b/t/java2.sh
diff --git a/t/java3.sh b/t/java3.sh
index 2c57684be..2c57684be 100755..100644
--- a/t/java3.sh
+++ b/t/java3.sh
diff --git a/t/javadir-undefined.sh b/t/javadir-undefined.sh
index 1aee94dae..1aee94dae 100755..100644
--- a/t/javadir-undefined.sh
+++ b/t/javadir-undefined.sh
diff --git a/t/javaflags.sh b/t/javaflags.sh
index b2f945950..b2f945950 100755..100644
--- a/t/javaflags.sh
+++ b/t/javaflags.sh
diff --git a/t/javaprim.sh b/t/javaprim.sh
index 1400d8899..1400d8899 100755..100644
--- a/t/javaprim.sh
+++ b/t/javaprim.sh
diff --git a/t/javasubst.sh b/t/javasubst.sh
index 7b2872dda..7b2872dda 100755..100644
--- a/t/javasubst.sh
+++ b/t/javasubst.sh
diff --git a/t/ldadd.sh b/t/ldadd.sh
index 2085a430b..2085a430b 100755..100644
--- a/t/ldadd.sh
+++ b/t/ldadd.sh
diff --git a/t/ldflags.sh b/t/ldflags.sh
index b00b97386..b00b97386 100755..100644
--- a/t/ldflags.sh
+++ b/t/ldflags.sh
diff --git a/t/lex-clean-cxx.sh b/t/lex-clean-cxx.sh
index 0f3510452..0f3510452 100755..100644
--- a/t/lex-clean-cxx.sh
+++ b/t/lex-clean-cxx.sh
diff --git a/t/lex-clean.sh b/t/lex-clean.sh
index 040c5b00c..040c5b00c 100755..100644
--- a/t/lex-clean.sh
+++ b/t/lex-clean.sh
diff --git a/t/lex-depend-cxx.sh b/t/lex-depend-cxx.sh
index b97d5d0b4..b97d5d0b4 100755..100644
--- a/t/lex-depend-cxx.sh
+++ b/t/lex-depend-cxx.sh
diff --git a/t/lex-depend-grep.sh b/t/lex-depend-grep.sh
index eb39f0191..eb39f0191 100755..100644
--- a/t/lex-depend-grep.sh
+++ b/t/lex-depend-grep.sh
diff --git a/t/lex-depend.sh b/t/lex-depend.sh
index 9be25995e..9be25995e 100755..100644
--- a/t/lex-depend.sh
+++ b/t/lex-depend.sh
diff --git a/t/lex-header.sh b/t/lex-header.sh
index e2546142e..e2546142e 100755..100644
--- a/t/lex-header.sh
+++ b/t/lex-header.sh
diff --git a/t/lex-lib-external.sh b/t/lex-lib-external.sh
index 2e7cebd2f..2e7cebd2f 100755..100644
--- a/t/lex-lib-external.sh
+++ b/t/lex-lib-external.sh
diff --git a/t/lex-lib.sh b/t/lex-lib.sh
index 2e5505ac9..2e5505ac9 100755..100644
--- a/t/lex-lib.sh
+++ b/t/lex-lib.sh
diff --git a/t/lex-libobj.sh b/t/lex-libobj.sh
index a78e4cf03..a78e4cf03 100755..100644
--- a/t/lex-libobj.sh
+++ b/t/lex-libobj.sh
diff --git a/t/lex-line.sh b/t/lex-line.sh
index 36faef14c..411c2c56e 100755..100644
--- a/t/lex-line.sh
+++ b/t/lex-line.sh
@@ -16,7 +16,6 @@
 
 # Check that automake lex support ensures that lex-generated C
 # files use correct "#line" directives.
-# 'subdir-object' option enabled.
 # See also sister test 'yacc-line.sh'.
 
 required='cc lex'
diff --git a/t/lex-multiple.sh b/t/lex-multiple.sh
index 7383eaf2d..7383eaf2d 100755..100644
--- a/t/lex-multiple.sh
+++ b/t/lex-multiple.sh
diff --git a/t/lex-nodist.sh b/t/lex-nodist.sh
index 2933b1a71..2933b1a71 100755..100644
--- a/t/lex-nodist.sh
+++ b/t/lex-nodist.sh
diff --git a/t/lex-noyywrap.sh b/t/lex-noyywrap.sh
index 72a627d0f..72a627d0f 100755..100644
--- a/t/lex-noyywrap.sh
+++ b/t/lex-noyywrap.sh
diff --git a/t/lex-subobj-nodep.sh b/t/lex-subobj-nodep.sh
index b4c24de8f..b4c24de8f 100755..100644
--- a/t/lex-subobj-nodep.sh
+++ b/t/lex-subobj-nodep.sh
diff --git a/t/lex.sh b/t/lex.sh
index af520b074..af520b074 100755..100644
--- a/t/lex.sh
+++ b/t/lex.sh
diff --git a/t/lex2.sh b/t/lex2.sh
index b2effd090..b2effd090 100755..100644
--- a/t/lex2.sh
+++ b/t/lex2.sh
diff --git a/t/lex3.sh b/t/lex3.sh
index ef6678977..ef6678977 100755..100644
--- a/t/lex3.sh
+++ b/t/lex3.sh
diff --git a/t/lex5.sh b/t/lex5.sh
index 57276fd8d..57276fd8d 100755..100644
--- a/t/lex5.sh
+++ b/t/lex5.sh
diff --git a/t/lexcpp.sh b/t/lexcpp.sh
index 1bee5ddac..1bee5ddac 100755..100644
--- a/t/lexcpp.sh
+++ b/t/lexcpp.sh
diff --git a/t/lexvpath.sh b/t/lexvpath.sh
index 53d1da94e..53d1da94e 100755..100644
--- a/t/lexvpath.sh
+++ b/t/lexvpath.sh
diff --git a/t/lflags.sh b/t/lflags.sh
index b9167cf18..b9167cf18 100755..100644
--- a/t/lflags.sh
+++ b/t/lflags.sh
diff --git a/t/lflags2.sh b/t/lflags2.sh
index b746b3c7f..b746b3c7f 100755..100644
--- a/t/lflags2.sh
+++ b/t/lflags2.sh
diff --git a/t/libexec.sh b/t/libexec.sh
index 29764b096..29764b096 100755..100644
--- a/t/libexec.sh
+++ b/t/libexec.sh
diff --git a/t/libobj-basic.sh b/t/libobj-basic.sh
index 190a35b51..190a35b51 100755..100644
--- a/t/libobj-basic.sh
+++ b/t/libobj-basic.sh
diff --git a/t/libobj10.sh b/t/libobj10.sh
index 9d4935da7..9d4935da7 100755..100644
--- a/t/libobj10.sh
+++ b/t/libobj10.sh
diff --git a/t/libobj12.sh b/t/libobj12.sh
index a8bbc042f..a8bbc042f 100755..100644
--- a/t/libobj12.sh
+++ b/t/libobj12.sh
diff --git a/t/libobj13.sh b/t/libobj13.sh
index cf26d7d0e..cf26d7d0e 100755..100644
--- a/t/libobj13.sh
+++ b/t/libobj13.sh
diff --git a/t/libobj14.sh b/t/libobj14.sh
index b9fbbda91..b9fbbda91 100755..100644
--- a/t/libobj14.sh
+++ b/t/libobj14.sh
diff --git a/t/libobj15a.sh b/t/libobj15a.sh
index 7213c9499..7213c9499 100755..100644
--- a/t/libobj15a.sh
+++ b/t/libobj15a.sh
diff --git a/t/libobj15b.sh b/t/libobj15b.sh
index 79ce8b569..79ce8b569 100755..100644
--- a/t/libobj15b.sh
+++ b/t/libobj15b.sh
diff --git a/t/libobj15c.sh b/t/libobj15c.sh
index ff3a8d86c..ff3a8d86c 100755..100644
--- a/t/libobj15c.sh
+++ b/t/libobj15c.sh
diff --git a/t/libobj16a.sh b/t/libobj16a.sh
index 98ce444ff..98ce444ff 100755..100644
--- a/t/libobj16a.sh
+++ b/t/libobj16a.sh
diff --git a/t/libobj16b.sh b/t/libobj16b.sh
index ed4674cf7..ed4674cf7 100755..100644
--- a/t/libobj16b.sh
+++ b/t/libobj16b.sh
diff --git a/t/libobj17.sh b/t/libobj17.sh
index 017fe095a..017fe095a 100755..100644
--- a/t/libobj17.sh
+++ b/t/libobj17.sh
diff --git a/t/libobj18.sh b/t/libobj18.sh
index ac007982b..ac007982b 100755..100644
--- a/t/libobj18.sh
+++ b/t/libobj18.sh
diff --git a/t/libobj19.sh b/t/libobj19.sh
index f0bca2cc3..f0bca2cc3 100755..100644
--- a/t/libobj19.sh
+++ b/t/libobj19.sh
diff --git a/t/libobj2.sh b/t/libobj2.sh
index c996906ea..c996906ea 100755..100644
--- a/t/libobj2.sh
+++ b/t/libobj2.sh
diff --git a/t/libobj20b.sh b/t/libobj20b.sh
index ca3ccd862..ca3ccd862 100755..100644
--- a/t/libobj20b.sh
+++ b/t/libobj20b.sh
diff --git a/t/libobj20c.sh b/t/libobj20c.sh
index 7b6261c2b..7b6261c2b 100755..100644
--- a/t/libobj20c.sh
+++ b/t/libobj20c.sh
diff --git a/t/libobj3.sh b/t/libobj3.sh
index 6f2d6e10d..6f2d6e10d 100755..100644
--- a/t/libobj3.sh
+++ b/t/libobj3.sh
diff --git a/t/libobj4.sh b/t/libobj4.sh
index 1956fbd41..1956fbd41 100755..100644
--- a/t/libobj4.sh
+++ b/t/libobj4.sh
diff --git a/t/libobj5.sh b/t/libobj5.sh
index 9689aa52e..9689aa52e 100755..100644
--- a/t/libobj5.sh
+++ b/t/libobj5.sh
diff --git a/t/libobj7.sh b/t/libobj7.sh
index 4b3050709..4b3050709 100755..100644
--- a/t/libobj7.sh
+++ b/t/libobj7.sh
diff --git a/t/library.sh b/t/library.sh
index cea4450d0..cea4450d0 100755..100644
--- a/t/library.sh
+++ b/t/library.sh
diff --git a/t/library2.sh b/t/library2.sh
index 60ab99c67..60ab99c67 100755..100644
--- a/t/library2.sh
+++ b/t/library2.sh
diff --git a/t/library3.sh b/t/library3.sh
index 906b85532..906b85532 100755..100644
--- a/t/library3.sh
+++ b/t/library3.sh
diff --git a/t/libtoo10.sh b/t/libtoo10.sh
index 5901dfe23..5901dfe23 100755..100644
--- a/t/libtoo10.sh
+++ b/t/libtoo10.sh
diff --git a/t/libtoo11.sh b/t/libtoo11.sh
index 5e597fa00..5e597fa00 100755..100644
--- a/t/libtoo11.sh
+++ b/t/libtoo11.sh
diff --git a/t/libtool-macros.sh b/t/libtool-macros.sh
index b9d328638..b9d328638 100755..100644
--- a/t/libtool-macros.sh
+++ b/t/libtool-macros.sh
diff --git a/t/libtool3.sh b/t/libtool3.sh
index 106aaab63..423d6ab0a 100755..100644
--- a/t/libtool3.sh
+++ b/t/libtool3.sh
@@ -28,10 +28,6 @@ AC_OUTPUT
 END
 
 cat > Makefile.am << 'END'
-# FIXME: stop disabling the warnings in the 'unsupported' category
-# FIXME: once the 'subdir-objects' option has been mandatory.
-AUTOMAKE_OPTIONS = -Wno-unsupported
-
 lib_LTLIBRARIES = lib0.la liba/liba.la
 lib0_la_SOURCES = 0.c
 liba_liba_la_SOURCES = liba/a.c
diff --git a/t/libtool4.sh b/t/libtool4.sh
index 2300f70c6..2300f70c6 100755..100644
--- a/t/libtool4.sh
+++ b/t/libtool4.sh
diff --git a/t/libtool5.sh b/t/libtool5.sh
index 61b92f131..61b92f131 100755..100644
--- a/t/libtool5.sh
+++ b/t/libtool5.sh
diff --git a/t/libtool6.sh b/t/libtool6.sh
index 1512a4484..1512a4484 100755..100644
--- a/t/libtool6.sh
+++ b/t/libtool6.sh
diff --git a/t/libtool7.sh b/t/libtool7.sh
index 1718bcfc1..1718bcfc1 100755..100644
--- a/t/libtool7.sh
+++ b/t/libtool7.sh
diff --git a/t/libtool8.sh b/t/libtool8.sh
index a44b67b9b..a44b67b9b 100755..100644
--- a/t/libtool8.sh
+++ b/t/libtool8.sh
diff --git a/t/libtool9.sh b/t/libtool9.sh
index cd3c2767d..cd3c2767d 100755..100644
--- a/t/libtool9.sh
+++ b/t/libtool9.sh
diff --git a/t/license.sh b/t/license.sh
index e7615f70f..e7615f70f 100755..100644
--- a/t/license.sh
+++ b/t/license.sh
diff --git a/t/license2.sh b/t/license2.sh
index 9e7107b0f..9e7107b0f 100755..100644
--- a/t/license2.sh
+++ b/t/license2.sh
diff --git a/t/link_c_cxx.sh b/t/link_c_cxx.sh
index 5fd82ac84..5fd82ac84 100755..100644
--- a/t/link_c_cxx.sh
+++ b/t/link_c_cxx.sh
diff --git a/t/link_cond.sh b/t/link_cond.sh
index 423ffe1bc..423ffe1bc 100755..100644
--- a/t/link_cond.sh
+++ b/t/link_cond.sh
diff --git a/t/link_dist.sh b/t/link_dist.sh
index 1d67695ff..1d67695ff 100755..100644
--- a/t/link_dist.sh
+++ b/t/link_dist.sh
diff --git a/t/link_f90_only.sh b/t/link_f90_only.sh
index 237181fc6..237181fc6 100755..100644
--- a/t/link_f90_only.sh
+++ b/t/link_f90_only.sh
diff --git a/t/link_f_only.sh b/t/link_f_only.sh
index eb60e6d02..eb60e6d02 100755..100644
--- a/t/link_f_only.sh
+++ b/t/link_f_only.sh
diff --git a/t/link_fc.sh b/t/link_fc.sh
index 22267436a..22267436a 100755..100644
--- a/t/link_fc.sh
+++ b/t/link_fc.sh
diff --git a/t/link_fccxx.sh b/t/link_fccxx.sh
index b05a3ad68..b05a3ad68 100755..100644
--- a/t/link_fccxx.sh
+++ b/t/link_fccxx.sh
diff --git a/t/link_fcxx.sh b/t/link_fcxx.sh
index be213004b..be213004b 100755..100644
--- a/t/link_fcxx.sh
+++ b/t/link_fcxx.sh
diff --git a/t/link_override.sh b/t/link_override.sh
index ed432c4ab..ed432c4ab 100755..100644
--- a/t/link_override.sh
+++ b/t/link_override.sh
diff --git a/t/lisp-flags.sh b/t/lisp-flags.sh
index adb0ba368..f94246118 100755..100644
--- a/t/lisp-flags.sh
+++ b/t/lisp-flags.sh
@@ -20,7 +20,7 @@
 
 # Don't get fooled when running as an Emacs subprocess.  This is
 # for the benefit of the "make -e" invocation below.
-EMACS=; unset EMACS
+unset EMACS
 
 cat > Makefile.am << 'EOF'
 lisp_LISP = foo.el
diff --git a/t/lisp-loadpath.sh b/t/lisp-loadpath.sh
index 6d381bd26..6d381bd26 100755..100644
--- a/t/lisp-loadpath.sh
+++ b/t/lisp-loadpath.sh
diff --git a/t/lisp-pr11806.sh b/t/lisp-pr11806.sh
index 5db265d5e..5db265d5e 100755..100644
--- a/t/lisp-pr11806.sh
+++ b/t/lisp-pr11806.sh
diff --git a/t/lisp-subdir-mix.sh b/t/lisp-subdir-mix.sh
index b721d3488..b721d3488 100755..100644
--- a/t/lisp-subdir-mix.sh
+++ b/t/lisp-subdir-mix.sh
diff --git a/t/lisp-subdir.sh b/t/lisp-subdir.sh
index 03b6af300..03b6af300 100755..100644
--- a/t/lisp-subdir.sh
+++ b/t/lisp-subdir.sh
diff --git a/t/lisp-subdir2.sh b/t/lisp-subdir2.sh
index 0eb3af197..0eb3af197 100755..100644
--- a/t/lisp-subdir2.sh
+++ b/t/lisp-subdir2.sh
diff --git a/t/lisp2.sh b/t/lisp2.sh
index 2cf16b503..2cf16b503 100755..100644
--- a/t/lisp2.sh
+++ b/t/lisp2.sh
diff --git a/t/lisp3.sh b/t/lisp3.sh
index 63e862250..63e862250 100755..100644
--- a/t/lisp3.sh
+++ b/t/lisp3.sh
diff --git a/t/lisp4.sh b/t/lisp4.sh
index e6325b0d8..e6325b0d8 100755..100644
--- a/t/lisp4.sh
+++ b/t/lisp4.sh
diff --git a/t/lisp5.sh b/t/lisp5.sh
index a4bb6fd0d..a4bb6fd0d 100755..100644
--- a/t/lisp5.sh
+++ b/t/lisp5.sh
diff --git a/t/lisp6.sh b/t/lisp6.sh
index 4b5f00669..0dd434466 100755..100644
--- a/t/lisp6.sh
+++ b/t/lisp6.sh
@@ -39,7 +39,7 @@ AC_OUTPUT
 EOF
 
 # Avoid possible spurious influences from the environment.
-want_two=; unset want_two
+unset want_two
 
 echo "(provide 'am-one)" > am-one.el
 echo "(require 'am-one)" > am-two.el
diff --git a/t/lisp7.sh b/t/lisp7.sh
index da461ac9b..da461ac9b 100755..100644
--- a/t/lisp7.sh
+++ b/t/lisp7.sh
diff --git a/t/lisp8.sh b/t/lisp8.sh
index 9ede9eed6..9ede9eed6 100755..100644
--- a/t/lisp8.sh
+++ b/t/lisp8.sh
diff --git a/t/lispdry.sh b/t/lispdry.sh
index 4cab399a7..4cab399a7 100755..100644
--- a/t/lispdry.sh
+++ b/t/lispdry.sh
diff --git a/t/listval.sh b/t/listval.sh
index a35dcb07f..a35dcb07f 100755..100644
--- a/t/listval.sh
+++ b/t/listval.sh
diff --git a/t/local-targets.sh b/t/local-targets.sh
index e88ee0e7f..e88ee0e7f 100755..100644
--- a/t/local-targets.sh
+++ b/t/local-targets.sh
diff --git a/t/location.sh b/t/location.sh
index ea865c5c7..ea865c5c7 100755..100644
--- a/t/location.sh
+++ b/t/location.sh
diff --git a/t/longlin2.sh b/t/longlin2.sh
index 6729e3f51..6729e3f51 100755..100644
--- a/t/longlin2.sh
+++ b/t/longlin2.sh
diff --git a/t/longline.sh b/t/longline.sh
index 282ddb404..282ddb404 100755..100644
--- a/t/longline.sh
+++ b/t/longline.sh
diff --git a/t/ltcond.sh b/t/ltcond.sh
index a076dc8ae..a076dc8ae 100755..100644
--- a/t/ltcond.sh
+++ b/t/ltcond.sh
diff --git a/t/ltcond2.sh b/t/ltcond2.sh
index fd4170d3a..fd4170d3a 100755..100644
--- a/t/ltcond2.sh
+++ b/t/ltcond2.sh
diff --git a/t/ltconv.sh b/t/ltconv.sh
index bfba2687b..bfba2687b 100755..100644
--- a/t/ltconv.sh
+++ b/t/ltconv.sh
diff --git a/t/ltdeps.sh b/t/ltdeps.sh
index 7599e2797..7599e2797 100755..100644
--- a/t/ltdeps.sh
+++ b/t/ltdeps.sh
diff --git a/t/ltinit.sh b/t/ltinit.sh
index 14653d7cd..14653d7cd 100755..100644
--- a/t/ltinit.sh
+++ b/t/ltinit.sh
diff --git a/t/ltinstloc.sh b/t/ltinstloc.sh
index bae3d49df..bae3d49df 100755..100644
--- a/t/ltinstloc.sh
+++ b/t/ltinstloc.sh
diff --git a/t/ltlibobjs.sh b/t/ltlibobjs.sh
index 5cdc9b052..5cdc9b052 100755..100644
--- a/t/ltlibobjs.sh
+++ b/t/ltlibobjs.sh
diff --git a/t/ltorder.sh b/t/ltorder.sh
index c243ac78b..c243ac78b 100755..100644
--- a/t/ltorder.sh
+++ b/t/ltorder.sh
diff --git a/t/m4-inclusion.sh b/t/m4-inclusion.sh
index 286ca186b..286ca186b 100755..100644
--- a/t/m4-inclusion.sh
+++ b/t/m4-inclusion.sh
diff --git a/t/maintclean-vpath.sh b/t/maintclean-vpath.sh
index 161eb81cb..161eb81cb 100755..100644
--- a/t/maintclean-vpath.sh
+++ b/t/maintclean-vpath.sh
diff --git a/t/maintclean.sh b/t/maintclean.sh
index 5fa2a011e..5fa2a011e 100755..100644
--- a/t/maintclean.sh
+++ b/t/maintclean.sh
diff --git a/t/make-dryrun.tap b/t/make-dryrun.tap
index 15f87b6eb..15f87b6eb 100755..100644
--- a/t/make-dryrun.tap
+++ b/t/make-dryrun.tap
diff --git a/t/make-keepgoing.tap b/t/make-keepgoing.tap
index af6fae5e6..af6fae5e6 100755..100644
--- a/t/make-keepgoing.tap
+++ b/t/make-keepgoing.tap
diff --git a/t/makefile-deps.sh b/t/makefile-deps.sh
index 6a013c5c0..6a013c5c0 100755..100644
--- a/t/makefile-deps.sh
+++ b/t/makefile-deps.sh
diff --git a/t/makej.sh b/t/makej.sh
index fafc938c3..fafc938c3 100755..100644
--- a/t/makej.sh
+++ b/t/makej.sh
diff --git a/t/makej2.sh b/t/makej2.sh
index 4cf53fb26..4cf53fb26 100755..100644
--- a/t/makej2.sh
+++ b/t/makej2.sh
diff --git a/t/maken.sh b/t/maken.sh
index da0cd4660..da0cd4660 100755..100644
--- a/t/maken.sh
+++ b/t/maken.sh
diff --git a/t/maken3.sh b/t/maken3.sh
index a93e30e60..a93e30e60 100755..100644
--- a/t/maken3.sh
+++ b/t/maken3.sh
diff --git a/t/makevars.sh b/t/makevars.sh
index a82251536..a82251536 100755..100644
--- a/t/makevars.sh
+++ b/t/makevars.sh
diff --git a/t/man.sh b/t/man.sh
index 52ded330f..52ded330f 100755..100644
--- a/t/man.sh
+++ b/t/man.sh
diff --git a/t/man2.sh b/t/man2.sh
index 8d1d35d8d..8d1d35d8d 100755..100644
--- a/t/man2.sh
+++ b/t/man2.sh
diff --git a/t/man3.sh b/t/man3.sh
index 33d9e9f4d..33d9e9f4d 100755..100644
--- a/t/man3.sh
+++ b/t/man3.sh
diff --git a/t/man5.sh b/t/man5.sh
index e500ccc94..e500ccc94 100755..100644
--- a/t/man5.sh
+++ b/t/man5.sh
diff --git a/t/man6.sh b/t/man6.sh
index 478f83719..478f83719 100755..100644
--- a/t/man6.sh
+++ b/t/man6.sh
diff --git a/t/man7.sh b/t/man7.sh
index 53ed3a762..53ed3a762 100755..100644
--- a/t/man7.sh
+++ b/t/man7.sh
diff --git a/t/man8.sh b/t/man8.sh
index 092473b35..092473b35 100755..100644
--- a/t/man8.sh
+++ b/t/man8.sh
diff --git a/t/mdate.sh b/t/mdate.sh
index e581b3241..e581b3241 100755..100644
--- a/t/mdate.sh
+++ b/t/mdate.sh
diff --git a/t/mdate2.sh b/t/mdate2.sh
index fa41864ed..fa41864ed 100755..100644
--- a/t/mdate2.sh
+++ b/t/mdate2.sh
diff --git a/t/mdate3.sh b/t/mdate3.sh
index e0de1a2c5..e0de1a2c5 100755..100644
--- a/t/mdate3.sh
+++ b/t/mdate3.sh
diff --git a/t/mdate5.sh b/t/mdate5.sh
index fadc363eb..fadc363eb 100755..100644
--- a/t/mdate5.sh
+++ b/t/mdate5.sh
diff --git a/t/mdate6.sh b/t/mdate6.sh
index 4a0dbb771..4a0dbb771 100755..100644
--- a/t/mdate6.sh
+++ b/t/mdate6.sh
diff --git a/t/memoize.tap b/t/memoize.tap
index 40e6e9fda..40e6e9fda 100755..100644
--- a/t/memoize.tap
+++ b/t/memoize.tap
diff --git a/t/missing-auxfile-stops-makefiles-creation.sh b/t/missing-auxfile-stops-makefiles-creation.sh
index 50aa48a71..754b316fe 100755..100644
--- a/t/missing-auxfile-stops-makefiles-creation.sh
+++ b/t/missing-auxfile-stops-makefiles-creation.sh
@@ -36,7 +36,7 @@ done
 
 $ACLOCAL
 
-unset AUTOMAKE_JOBS || :
+unset AUTOMAKE_JOBS
 
 AUTOMAKE_fails
 ls -l Makefile.in */Makefile.in || : # For debugging.
diff --git a/t/missing-version-mismatch.sh b/t/missing-version-mismatch.sh
index e7f0e32e2..e7f0e32e2 100755..100644
--- a/t/missing-version-mismatch.sh
+++ b/t/missing-version-mismatch.sh
diff --git a/t/missing3.sh b/t/missing3.sh
index 2b6e1eb04..2b6e1eb04 100755..100644
--- a/t/missing3.sh
+++ b/t/missing3.sh
diff --git a/t/mkinst2.sh b/t/mkinst2.sh
index fe6e148b5..fe6e148b5 100755..100644
--- a/t/mkinst2.sh
+++ b/t/mkinst2.sh
diff --git a/t/mkinst3.sh b/t/mkinst3.sh
index a64adb4ed..a64adb4ed 100755..100644
--- a/t/mkinst3.sh
+++ b/t/mkinst3.sh
diff --git a/t/no-c.tap b/t/no-c.tap
index 01e0d22d9..01e0d22d9 100755..100644
--- a/t/no-c.tap
+++ b/t/no-c.tap
diff --git a/t/no-extra-makefile-code.sh b/t/no-extra-makefile-code.sh
index 01891bf1c..01891bf1c 100755..100644
--- a/t/no-extra-makefile-code.sh
+++ b/t/no-extra-makefile-code.sh
diff --git a/t/no-spurious-install-recursive.sh b/t/no-spurious-install-recursive.sh
index 2f6cd553a..2f6cd553a 100755..100644
--- a/t/no-spurious-install-recursive.sh
+++ b/t/no-spurious-install-recursive.sh
diff --git a/t/nobase-libtool.sh b/t/nobase-libtool.sh
index 2faff9c74..2faff9c74 100755..100644
--- a/t/nobase-libtool.sh
+++ b/t/nobase-libtool.sh
diff --git a/t/nobase-nodist.sh b/t/nobase-nodist.sh
index 44c13c779..44c13c779 100755..100644
--- a/t/nobase-nodist.sh
+++ b/t/nobase-nodist.sh
diff --git a/t/nobase-python.sh b/t/nobase-python.sh
index 33de07a1b..33de07a1b 100755..100644
--- a/t/nobase-python.sh
+++ b/t/nobase-python.sh
diff --git a/t/nobase.sh b/t/nobase.sh
index ba76b4960..ba76b4960 100755..100644
--- a/t/nobase.sh
+++ b/t/nobase.sh
diff --git a/t/nodef.sh b/t/nodef.sh
index 68659d976..68659d976 100755..100644
--- a/t/nodef.sh
+++ b/t/nodef.sh
diff --git a/t/nodef2.sh b/t/nodef2.sh
index dbda85a96..dbda85a96 100755..100644
--- a/t/nodef2.sh
+++ b/t/nodef2.sh
diff --git a/t/nodep2.sh b/t/nodep2.sh
index 5633ef98c..5633ef98c 100755..100644
--- a/t/nodep2.sh
+++ b/t/nodep2.sh
diff --git a/t/nodepcomp.sh b/t/nodepcomp.sh
index af7cec904..af7cec904 100755..100644
--- a/t/nodepcomp.sh
+++ b/t/nodepcomp.sh
diff --git a/t/nodist.sh b/t/nodist.sh
index 846dc64e7..846dc64e7 100755..100644
--- a/t/nodist.sh
+++ b/t/nodist.sh
diff --git a/t/nodist2.sh b/t/nodist2.sh
index 59e82f66f..59e82f66f 100755..100644
--- a/t/nodist2.sh
+++ b/t/nodist2.sh
diff --git a/t/nodist3.sh b/t/nodist3.sh
index c053980df..c053980df 100755..100644
--- a/t/nodist3.sh
+++ b/t/nodist3.sh
diff --git a/t/noinst.sh b/t/noinst.sh
index 90ea544b1..90ea544b1 100755..100644
--- a/t/noinst.sh
+++ b/t/noinst.sh
diff --git a/t/noinstdir.sh b/t/noinstdir.sh
index b5bc5bc00..b5bc5bc00 100755..100644
--- a/t/noinstdir.sh
+++ b/t/noinstdir.sh
diff --git a/t/nolink.sh b/t/nolink.sh
index 67da5e6c9..67da5e6c9 100755..100644
--- a/t/nolink.sh
+++ b/t/nolink.sh
diff --git a/t/nostdinc.sh b/t/nostdinc.sh
index f6f146eda..f6f146eda 100755..100644
--- a/t/nostdinc.sh
+++ b/t/nostdinc.sh
diff --git a/t/notrans.sh b/t/notrans.sh
index 1492b6685..1492b6685 100755..100644
--- a/t/notrans.sh
+++ b/t/notrans.sh
diff --git a/t/number.sh b/t/number.sh
index 61a3dee8d..61a3dee8d 100755..100644
--- a/t/number.sh
+++ b/t/number.sh
diff --git a/t/objc-basic.sh b/t/objc-basic.sh
index a80833871..a80833871 100755..100644
--- a/t/objc-basic.sh
+++ b/t/objc-basic.sh
diff --git a/t/objc-deps.sh b/t/objc-deps.sh
index 5dcb884f2..5dcb884f2 100755..100644
--- a/t/objc-deps.sh
+++ b/t/objc-deps.sh
diff --git a/t/objc-flags.sh b/t/objc-flags.sh
index 9b2bbda7a..9b2bbda7a 100755..100644
--- a/t/objc-flags.sh
+++ b/t/objc-flags.sh
diff --git a/t/objc-megademo.sh b/t/objc-megademo.sh
index 07764cd0a..07764cd0a 100755..100644
--- a/t/objc-megademo.sh
+++ b/t/objc-megademo.sh
diff --git a/t/objc-minidemo.sh b/t/objc-minidemo.sh
index 5a2d8214c..5a2d8214c 100755..100644
--- a/t/objc-minidemo.sh
+++ b/t/objc-minidemo.sh
diff --git a/t/objcxx-basic.sh b/t/objcxx-basic.sh
index 315fb438d..315fb438d 100755..100644
--- a/t/objcxx-basic.sh
+++ b/t/objcxx-basic.sh
diff --git a/t/objcxx-deps.sh b/t/objcxx-deps.sh
index 032e445bd..032e445bd 100755..100644
--- a/t/objcxx-deps.sh
+++ b/t/objcxx-deps.sh
diff --git a/t/objcxx-flags.sh b/t/objcxx-flags.sh
index 986ebf55b..986ebf55b 100755..100644
--- a/t/objcxx-flags.sh
+++ b/t/objcxx-flags.sh
diff --git a/t/objcxx-minidemo.sh b/t/objcxx-minidemo.sh
index 41f663458..41f663458 100755..100644
--- a/t/objcxx-minidemo.sh
+++ b/t/objcxx-minidemo.sh
diff --git a/t/objdir.sh b/t/objdir.sh
index 2808347e2..2808347e2 100755..100644
--- a/t/objdir.sh
+++ b/t/objdir.sh
diff --git a/t/objext-pr10128.sh b/t/objext-pr10128.sh
index 6fb64ab2a..6fb64ab2a 100755..100644
--- a/t/objext-pr10128.sh
+++ b/t/objext-pr10128.sh
diff --git a/t/oldvars.sh b/t/oldvars.sh
index b1add92e9..b1add92e9 100755..100644
--- a/t/oldvars.sh
+++ b/t/oldvars.sh
diff --git a/t/option-ng.sh b/t/option-ng.sh
index 3adc4fa90..3adc4fa90 100755..100644
--- a/t/option-ng.sh
+++ b/t/option-ng.sh
diff --git a/t/order.sh b/t/order.sh
index 9e2a0883e..9e2a0883e 100755..100644
--- a/t/order.sh
+++ b/t/order.sh
diff --git a/t/output-order.sh b/t/output-order.sh
index 6d391d6d0..6d391d6d0 100755..100644
--- a/t/output-order.sh
+++ b/t/output-order.sh
diff --git a/t/output.sh b/t/output.sh
index da21f645c..da21f645c 100755..100644
--- a/t/output.sh
+++ b/t/output.sh
diff --git a/t/output10.sh b/t/output10.sh
index d2a84f0ad..d2a84f0ad 100755..100644
--- a/t/output10.sh
+++ b/t/output10.sh
diff --git a/t/output11.sh b/t/output11.sh
index 24720e03a..24720e03a 100755..100644
--- a/t/output11.sh
+++ b/t/output11.sh
diff --git a/t/output12.sh b/t/output12.sh
index 36e9f9ebb..36e9f9ebb 100755..100644
--- a/t/output12.sh
+++ b/t/output12.sh
diff --git a/t/output13.sh b/t/output13.sh
index e9779e73f..e9779e73f 100755..100644
--- a/t/output13.sh
+++ b/t/output13.sh
diff --git a/t/output2.sh b/t/output2.sh
index 1ef3e1dea..1ef3e1dea 100755..100644
--- a/t/output2.sh
+++ b/t/output2.sh
diff --git a/t/output3.sh b/t/output3.sh
index 83c518cd8..83c518cd8 100755..100644
--- a/t/output3.sh
+++ b/t/output3.sh
diff --git a/t/output4.sh b/t/output4.sh
index ed5e4db95..ed5e4db95 100755..100644
--- a/t/output4.sh
+++ b/t/output4.sh
diff --git a/t/output5.sh b/t/output5.sh
index 1e76898f6..1e76898f6 100755..100644
--- a/t/output5.sh
+++ b/t/output5.sh
diff --git a/t/output6.sh b/t/output6.sh
index 0cdfb0322..0cdfb0322 100755..100644
--- a/t/output6.sh
+++ b/t/output6.sh
diff --git a/t/output7.sh b/t/output7.sh
index 8ec74bc94..8ec74bc94 100755..100644
--- a/t/output7.sh
+++ b/t/output7.sh
diff --git a/t/output8.sh b/t/output8.sh
index 3c4b3e8a4..3c4b3e8a4 100755..100644
--- a/t/output8.sh
+++ b/t/output8.sh
diff --git a/t/output9.sh b/t/output9.sh
index 7424236e5..7424236e5 100755..100644
--- a/t/output9.sh
+++ b/t/output9.sh
diff --git a/t/override-conditional-1.sh b/t/override-conditional-1.sh
index b350d27b7..b350d27b7 100755..100644
--- a/t/override-conditional-1.sh
+++ b/t/override-conditional-1.sh
diff --git a/t/override-conditional-2.sh b/t/override-conditional-2.sh
index 9a352c695..9a352c695 100755..100644
--- a/t/override-conditional-2.sh
+++ b/t/override-conditional-2.sh
diff --git a/t/override-html.sh b/t/override-html.sh
index 8666b3785..8666b3785 100755..100644
--- a/t/override-html.sh
+++ b/t/override-html.sh
diff --git a/t/override-suggest-local.sh b/t/override-suggest-local.sh
index bf0f6adc4..bf0f6adc4 100755..100644
--- a/t/override-suggest-local.sh
+++ b/t/override-suggest-local.sh
diff --git a/t/parallel-tests-basics.sh b/t/parallel-tests-basics.sh
index 8896acefd..8896acefd 100755..100644
--- a/t/parallel-tests-basics.sh
+++ b/t/parallel-tests-basics.sh
diff --git a/t/parallel-tests-concatenated-suffix.sh b/t/parallel-tests-concatenated-suffix.sh
index ee83af155..ee83af155 100755..100644
--- a/t/parallel-tests-concatenated-suffix.sh
+++ b/t/parallel-tests-concatenated-suffix.sh
diff --git a/t/parallel-tests-concurrency-2.sh b/t/parallel-tests-concurrency-2.sh
index fd076db5f..fd076db5f 100755..100644
--- a/t/parallel-tests-concurrency-2.sh
+++ b/t/parallel-tests-concurrency-2.sh
diff --git a/t/parallel-tests-concurrency.sh b/t/parallel-tests-concurrency.sh
index 30b05e840..30b05e840 100755..100644
--- a/t/parallel-tests-concurrency.sh
+++ b/t/parallel-tests-concurrency.sh
diff --git a/t/parallel-tests-console-output.sh b/t/parallel-tests-console-output.sh
index 2b8cebf9b..2b8cebf9b 100755..100644
--- a/t/parallel-tests-console-output.sh
+++ b/t/parallel-tests-console-output.sh
diff --git a/t/parallel-tests-driver-install.sh b/t/parallel-tests-driver-install.sh
index d49b35a0c..d49b35a0c 100755..100644
--- a/t/parallel-tests-driver-install.sh
+++ b/t/parallel-tests-driver-install.sh
diff --git a/t/parallel-tests-dry-run-1.sh b/t/parallel-tests-dry-run-1.sh
index be81456dd..be81456dd 100755..100644
--- a/t/parallel-tests-dry-run-1.sh
+++ b/t/parallel-tests-dry-run-1.sh
diff --git a/t/parallel-tests-dry-run-2.sh b/t/parallel-tests-dry-run-2.sh
index 087e22f80..087e22f80 100755..100644
--- a/t/parallel-tests-dry-run-2.sh
+++ b/t/parallel-tests-dry-run-2.sh
diff --git a/t/parallel-tests-dynamic.sh b/t/parallel-tests-dynamic.sh
index 3652064b6..3652064b6 100755..100644
--- a/t/parallel-tests-dynamic.sh
+++ b/t/parallel-tests-dynamic.sh
diff --git a/t/parallel-tests-empty.sh b/t/parallel-tests-empty.sh
index faa7c4a5d..faa7c4a5d 100755..100644
--- a/t/parallel-tests-empty.sh
+++ b/t/parallel-tests-empty.sh
diff --git a/t/parallel-tests-exeext.sh b/t/parallel-tests-exeext.sh
index b53a7b757..b53a7b757 100755..100644
--- a/t/parallel-tests-exeext.sh
+++ b/t/parallel-tests-exeext.sh
diff --git a/t/parallel-tests-exit-statuses.sh b/t/parallel-tests-exit-statuses.sh
index a532230df..a532230df 100755..100644
--- a/t/parallel-tests-exit-statuses.sh
+++ b/t/parallel-tests-exit-statuses.sh
diff --git a/t/parallel-tests-extra-programs.sh b/t/parallel-tests-extra-programs.sh
index 42312eaed..42312eaed 100755..100644
--- a/t/parallel-tests-extra-programs.sh
+++ b/t/parallel-tests-extra-programs.sh
diff --git a/t/parallel-tests-fd-redirect-exeext.sh b/t/parallel-tests-fd-redirect-exeext.sh
index 03bb225bb..03bb225bb 100755..100644
--- a/t/parallel-tests-fd-redirect-exeext.sh
+++ b/t/parallel-tests-fd-redirect-exeext.sh
diff --git a/t/parallel-tests-fd-redirect.sh b/t/parallel-tests-fd-redirect.sh
index 80f08d95b..80f08d95b 100755..100644
--- a/t/parallel-tests-fd-redirect.sh
+++ b/t/parallel-tests-fd-redirect.sh
diff --git a/t/parallel-tests-fork-bomb.sh b/t/parallel-tests-fork-bomb.sh
index 04821e105..04821e105 100755..100644
--- a/t/parallel-tests-fork-bomb.sh
+++ b/t/parallel-tests-fork-bomb.sh
diff --git a/t/parallel-tests-generated-and-distributed.sh b/t/parallel-tests-generated-and-distributed.sh
index 158358c6a..158358c6a 100755..100644
--- a/t/parallel-tests-generated-and-distributed.sh
+++ b/t/parallel-tests-generated-and-distributed.sh
diff --git a/t/parallel-tests-harderror.sh b/t/parallel-tests-harderror.sh
index 1f80e3289..1f80e3289 100755..100644
--- a/t/parallel-tests-harderror.sh
+++ b/t/parallel-tests-harderror.sh
diff --git a/t/parallel-tests-interrupt.tap b/t/parallel-tests-interrupt.tap
index 106859039..106859039 100755..100644
--- a/t/parallel-tests-interrupt.tap
+++ b/t/parallel-tests-interrupt.tap
diff --git a/t/parallel-tests-log-compiler-1.sh b/t/parallel-tests-log-compiler-1.sh
index fbc0389f1..fbc0389f1 100755..100644
--- a/t/parallel-tests-log-compiler-1.sh
+++ b/t/parallel-tests-log-compiler-1.sh
diff --git a/t/parallel-tests-log-compiler-2.sh b/t/parallel-tests-log-compiler-2.sh
index f970adee3..f970adee3 100755..100644
--- a/t/parallel-tests-log-compiler-2.sh
+++ b/t/parallel-tests-log-compiler-2.sh
diff --git a/t/parallel-tests-log-override.sh b/t/parallel-tests-log-override.sh
index eaef310a5..eaef310a5 100755..100644
--- a/t/parallel-tests-log-override.sh
+++ b/t/parallel-tests-log-override.sh
diff --git a/t/parallel-tests-logvars-example.sh b/t/parallel-tests-logvars-example.sh
index 4a2bd2574..4a2bd2574 100755..100644
--- a/t/parallel-tests-logvars-example.sh
+++ b/t/parallel-tests-logvars-example.sh
diff --git a/t/parallel-tests-longest-stem.sh b/t/parallel-tests-longest-stem.sh
index aed831eb5..aed831eb5 100755..100644
--- a/t/parallel-tests-longest-stem.sh
+++ b/t/parallel-tests-longest-stem.sh
diff --git a/t/parallel-tests-many.sh b/t/parallel-tests-many.sh
index 53899527e..53899527e 100755..100644
--- a/t/parallel-tests-many.sh
+++ b/t/parallel-tests-many.sh
diff --git a/t/parallel-tests-no-color-in-log.sh b/t/parallel-tests-no-color-in-log.sh
index f5fa9f2ba..f5fa9f2ba 100755..100644
--- a/t/parallel-tests-no-color-in-log.sh
+++ b/t/parallel-tests-no-color-in-log.sh
diff --git a/t/parallel-tests-no-repeat.sh b/t/parallel-tests-no-repeat.sh
index f0beb6734..f0beb6734 100755..100644
--- a/t/parallel-tests-no-repeat.sh
+++ b/t/parallel-tests-no-repeat.sh
diff --git a/t/parallel-tests-once.sh b/t/parallel-tests-once.sh
index 6fdc09851..6fdc09851 100755..100644
--- a/t/parallel-tests-once.sh
+++ b/t/parallel-tests-once.sh
diff --git a/t/parallel-tests-per-suffix-deps.sh b/t/parallel-tests-per-suffix-deps.sh
index 4d1e55af1..4d1e55af1 100755..100644
--- a/t/parallel-tests-per-suffix-deps.sh
+++ b/t/parallel-tests-per-suffix-deps.sh
diff --git a/t/parallel-tests-recheck-depends-on-all.sh b/t/parallel-tests-recheck-depends-on-all.sh
index e2c69162d..e2c69162d 100755..100644
--- a/t/parallel-tests-recheck-depends-on-all.sh
+++ b/t/parallel-tests-recheck-depends-on-all.sh
diff --git a/t/parallel-tests-recheck-pr11791.sh b/t/parallel-tests-recheck-pr11791.sh
index 09292048d..f89708afc 100755..100644
--- a/t/parallel-tests-recheck-pr11791.sh
+++ b/t/parallel-tests-recheck-pr11791.sh
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# parallel-tests: "make recheck" "make -k recheck" in the face of build
+# parallel-tests: "make -k recheck" in the face of build
 # failures for the test cases.  See automake bug#11791.
 
 required='cc native'
diff --git a/t/parallel-tests-recheck.sh b/t/parallel-tests-recheck.sh
index f70bbc91e..f70bbc91e 100755..100644
--- a/t/parallel-tests-recheck.sh
+++ b/t/parallel-tests-recheck.sh
diff --git a/t/parallel-tests-reset-term.sh b/t/parallel-tests-reset-term.sh
index fb737bc50..fb737bc50 100755..100644
--- a/t/parallel-tests-reset-term.sh
+++ b/t/parallel-tests-reset-term.sh
diff --git a/t/parallel-tests-srcdir-in-test-name.sh b/t/parallel-tests-srcdir-in-test-name.sh
index 8b3208d65..8b3208d65 100755..100644
--- a/t/parallel-tests-srcdir-in-test-name.sh
+++ b/t/parallel-tests-srcdir-in-test-name.sh
diff --git a/t/parallel-tests-subdir.sh b/t/parallel-tests-subdir.sh
index 841f933bb..841f933bb 100755..100644
--- a/t/parallel-tests-subdir.sh
+++ b/t/parallel-tests-subdir.sh
diff --git a/t/parallel-tests-suffix-prog.sh b/t/parallel-tests-suffix-prog.sh
index 7b924a33b..7b924a33b 100755..100644
--- a/t/parallel-tests-suffix-prog.sh
+++ b/t/parallel-tests-suffix-prog.sh
diff --git a/t/parallel-tests-suffix.sh b/t/parallel-tests-suffix.sh
index 2ebb6887e..2ebb6887e 100755..100644
--- a/t/parallel-tests-suffix.sh
+++ b/t/parallel-tests-suffix.sh
diff --git a/t/parallel-tests-trailing-whitespace.sh b/t/parallel-tests-trailing-whitespace.sh
index 4c64e3a45..4c64e3a45 100755..100644
--- a/t/parallel-tests-trailing-whitespace.sh
+++ b/t/parallel-tests-trailing-whitespace.sh
diff --git a/t/parallel-tests-unreadable.sh b/t/parallel-tests-unreadable.sh
index 898532d44..898532d44 100755..100644
--- a/t/parallel-tests-unreadable.sh
+++ b/t/parallel-tests-unreadable.sh
diff --git a/t/parse.sh b/t/parse.sh
index 03497d480..03497d480 100755..100644
--- a/t/parse.sh
+++ b/t/parse.sh
diff --git a/t/pattern-rules.sh b/t/pattern-rules.sh
index f7b0adceb..f7b0adceb 100755..100644
--- a/t/pattern-rules.sh
+++ b/t/pattern-rules.sh
diff --git a/t/pattern-rules2.sh b/t/pattern-rules2.sh
index 6bbad669c..6bbad669c 100755..100644
--- a/t/pattern-rules2.sh
+++ b/t/pattern-rules2.sh
diff --git a/t/per-target-flags.sh b/t/per-target-flags.sh
index 6385f2ca0..6385f2ca0 100755..100644
--- a/t/per-target-flags.sh
+++ b/t/per-target-flags.sh
diff --git a/t/phony.sh b/t/phony.sh
index 6e368d601..6e368d601 100755..100644
--- a/t/phony.sh
+++ b/t/phony.sh
diff --git a/t/pkg-config-macros.sh b/t/pkg-config-macros.sh
index 5069c0887..cfa49cf36 100755..100644
--- a/t/pkg-config-macros.sh
+++ b/t/pkg-config-macros.sh
@@ -78,7 +78,7 @@ else
    echo "skip_all_ \"pkg-config m4 macros not found\"" >> get.sh
 fi
 
-ACLOCAL_PATH=; unset ACLOCAL_PATH
+unset ACLOCAL_PATH
 . ./get.sh
 
 $ACLOCAL --force -I m4 || cat >> get.sh <<'END'
diff --git a/t/pluseq.sh b/t/pluseq.sh
index 955ace66d..955ace66d 100755..100644
--- a/t/pluseq.sh
+++ b/t/pluseq.sh
diff --git a/t/pluseq10.sh b/t/pluseq10.sh
index e283ca7fa..e283ca7fa 100755..100644
--- a/t/pluseq10.sh
+++ b/t/pluseq10.sh
diff --git a/t/pluseq11.sh b/t/pluseq11.sh
index b2f026dfb..b2f026dfb 100755..100644
--- a/t/pluseq11.sh
+++ b/t/pluseq11.sh
diff --git a/t/pluseq2.sh b/t/pluseq2.sh
index 359fa8bd8..359fa8bd8 100755..100644
--- a/t/pluseq2.sh
+++ b/t/pluseq2.sh
diff --git a/t/pluseq3.sh b/t/pluseq3.sh
index 32d571693..32d571693 100755..100644
--- a/t/pluseq3.sh
+++ b/t/pluseq3.sh
diff --git a/t/pluseq4.sh b/t/pluseq4.sh
index a7be38b27..a7be38b27 100755..100644
--- a/t/pluseq4.sh
+++ b/t/pluseq4.sh
diff --git a/t/pluseq5.sh b/t/pluseq5.sh
index bbabebdaa..bbabebdaa 100755..100644
--- a/t/pluseq5.sh
+++ b/t/pluseq5.sh
diff --git a/t/pluseq6.sh b/t/pluseq6.sh
index 14db1acb8..14db1acb8 100755..100644
--- a/t/pluseq6.sh
+++ b/t/pluseq6.sh
diff --git a/t/pluseq7.sh b/t/pluseq7.sh
index ab639ee83..ab639ee83 100755..100644
--- a/t/pluseq7.sh
+++ b/t/pluseq7.sh
diff --git a/t/pluseq8.sh b/t/pluseq8.sh
index 5816b837d..5816b837d 100755..100644
--- a/t/pluseq8.sh
+++ b/t/pluseq8.sh
diff --git a/t/pluseq9.sh b/t/pluseq9.sh
index 875d4947e..875d4947e 100755..100644
--- a/t/pluseq9.sh
+++ b/t/pluseq9.sh
diff --git a/t/posixsubst-data.sh b/t/posixsubst-data.sh
index 367a5eed1..367a5eed1 100755..100644
--- a/t/posixsubst-data.sh
+++ b/t/posixsubst-data.sh
diff --git a/t/posixsubst-extradist.sh b/t/posixsubst-extradist.sh
index 9d18bceb8..9d18bceb8 100755..100644
--- a/t/posixsubst-extradist.sh
+++ b/t/posixsubst-extradist.sh
diff --git a/t/posixsubst-ldadd.sh b/t/posixsubst-ldadd.sh
index a53ebbdf1..a53ebbdf1 100755..100644
--- a/t/posixsubst-ldadd.sh
+++ b/t/posixsubst-ldadd.sh
diff --git a/t/posixsubst-libraries.sh b/t/posixsubst-libraries.sh
index b3e9a2dd2..b3e9a2dd2 100755..100644
--- a/t/posixsubst-libraries.sh
+++ b/t/posixsubst-libraries.sh
diff --git a/t/posixsubst-ltlibraries.sh b/t/posixsubst-ltlibraries.sh
index cc93aa7a1..cc93aa7a1 100755..100644
--- a/t/posixsubst-ltlibraries.sh
+++ b/t/posixsubst-ltlibraries.sh
diff --git a/t/posixsubst-programs.sh b/t/posixsubst-programs.sh
index 9bb2b5423..9bb2b5423 100755..100644
--- a/t/posixsubst-programs.sh
+++ b/t/posixsubst-programs.sh
diff --git a/t/posixsubst-scripts.sh b/t/posixsubst-scripts.sh
index 1fd7dddb2..1fd7dddb2 100755..100644
--- a/t/posixsubst-scripts.sh
+++ b/t/posixsubst-scripts.sh
diff --git a/t/posixsubst-sources.sh b/t/posixsubst-sources.sh
index 08afb6e4d..08afb6e4d 100755..100644
--- a/t/posixsubst-sources.sh
+++ b/t/posixsubst-sources.sh
diff --git a/t/ppf77.sh b/t/ppf77.sh
index a861fa0b5..a861fa0b5 100755..100644
--- a/t/ppf77.sh
+++ b/t/ppf77.sh
diff --git a/t/pr2.sh b/t/pr2.sh
index 4d937112a..4d937112a 100755..100644
--- a/t/pr2.sh
+++ b/t/pr2.sh
diff --git a/t/pr211.sh b/t/pr211.sh
index 00428f0f3..00428f0f3 100755..100644
--- a/t/pr211.sh
+++ b/t/pr211.sh
diff --git a/t/pr220.sh b/t/pr220.sh
index 715b5b239..715b5b239 100755..100644
--- a/t/pr220.sh
+++ b/t/pr220.sh
diff --git a/t/pr224.sh b/t/pr224.sh
index d6b75e371..d6b75e371 100755..100644
--- a/t/pr224.sh
+++ b/t/pr224.sh
diff --git a/t/pr229.sh b/t/pr229.sh
index 14203aac5..14203aac5 100755..100644
--- a/t/pr229.sh
+++ b/t/pr229.sh
diff --git a/t/pr279-2.sh b/t/pr279-2.sh
index 9cdc43b20..9cdc43b20 100755..100644
--- a/t/pr279-2.sh
+++ b/t/pr279-2.sh
diff --git a/t/pr279.sh b/t/pr279.sh
index 2ed791b49..2ed791b49 100755..100644
--- a/t/pr279.sh
+++ b/t/pr279.sh
diff --git a/t/pr287.sh b/t/pr287.sh
index 152c81d68..152c81d68 100755..100644
--- a/t/pr287.sh
+++ b/t/pr287.sh
diff --git a/t/pr300-lib.sh b/t/pr300-lib.sh
index 6b00b8eea..6b00b8eea 100755..100644
--- a/t/pr300-lib.sh
+++ b/t/pr300-lib.sh
diff --git a/t/pr300-ltlib.sh b/t/pr300-ltlib.sh
index b3d759f4d..b3d759f4d 100755..100644
--- a/t/pr300-ltlib.sh
+++ b/t/pr300-ltlib.sh
diff --git a/t/pr300-prog.sh b/t/pr300-prog.sh
index 25afe54e6..25afe54e6 100755..100644
--- a/t/pr300-prog.sh
+++ b/t/pr300-prog.sh
diff --git a/t/pr307.sh b/t/pr307.sh
index e2cc2566d..e2cc2566d 100755..100644
--- a/t/pr307.sh
+++ b/t/pr307.sh
diff --git a/t/pr401.sh b/t/pr401.sh
index cb58b0a9e..cb58b0a9e 100755..100644
--- a/t/pr401.sh
+++ b/t/pr401.sh
diff --git a/t/pr401b.sh b/t/pr401b.sh
index 202587f45..202587f45 100755..100644
--- a/t/pr401b.sh
+++ b/t/pr401b.sh
diff --git a/t/pr401c.sh b/t/pr401c.sh
index d4499f0d1..d4499f0d1 100755..100644
--- a/t/pr401c.sh
+++ b/t/pr401c.sh
diff --git a/t/pr72.sh b/t/pr72.sh
index 14135956a..14135956a 100755..100644
--- a/t/pr72.sh
+++ b/t/pr72.sh
diff --git a/t/pr87.sh b/t/pr87.sh
index 6c19e403f..6c19e403f 100755..100644
--- a/t/pr87.sh
+++ b/t/pr87.sh
diff --git a/t/pr9.sh b/t/pr9.sh
index aaba82d31..aaba82d31 100755..100644
--- a/t/pr9.sh
+++ b/t/pr9.sh
diff --git a/t/prefix.sh b/t/prefix.sh
index cbb655c24..cbb655c24 100755..100644
--- a/t/prefix.sh
+++ b/t/prefix.sh
diff --git a/t/preproc-basics.sh b/t/preproc-basics.sh
index 6000d883c..6000d883c 100755..100644
--- a/t/preproc-basics.sh
+++ b/t/preproc-basics.sh
diff --git a/t/preproc-c-compile.sh b/t/preproc-c-compile.sh
index 7c398a83e..7c398a83e 100755..100644
--- a/t/preproc-c-compile.sh
+++ b/t/preproc-c-compile.sh
diff --git a/t/preproc-demo.sh b/t/preproc-demo.sh
index 4c1b2d9dd..4c1b2d9dd 100755..100644
--- a/t/preproc-demo.sh
+++ b/t/preproc-demo.sh
diff --git a/t/preproc-errmsg.sh b/t/preproc-errmsg.sh
index fd428c119..fd428c119 100755..100644
--- a/t/preproc-errmsg.sh
+++ b/t/preproc-errmsg.sh
diff --git a/t/primary-prefix-couples-documented-valid.sh b/t/primary-prefix-couples-documented-valid.sh
index 5be9f5f0a..5be9f5f0a 100755..100644
--- a/t/primary-prefix-couples-documented-valid.sh
+++ b/t/primary-prefix-couples-documented-valid.sh
diff --git a/t/primary-prefix-couples-force-valid.sh b/t/primary-prefix-couples-force-valid.sh
index 94fbf0a3b..94fbf0a3b 100755..100644
--- a/t/primary-prefix-couples-force-valid.sh
+++ b/t/primary-prefix-couples-force-valid.sh
diff --git a/t/primary-prefix-invalid-couples.tap b/t/primary-prefix-invalid-couples.tap
index 64f11f833..64f11f833 100755..100644
--- a/t/primary-prefix-invalid-couples.tap
+++ b/t/primary-prefix-invalid-couples.tap
diff --git a/t/primary-prefix-valid-couples.sh b/t/primary-prefix-valid-couples.sh
index 17a2a9b03..17a2a9b03 100755..100644
--- a/t/primary-prefix-valid-couples.sh
+++ b/t/primary-prefix-valid-couples.sh
diff --git a/t/primary.sh b/t/primary.sh
index 114af350b..114af350b 100755..100644
--- a/t/primary.sh
+++ b/t/primary.sh
diff --git a/t/primary2.sh b/t/primary2.sh
index f9f7671da..f9f7671da 100755..100644
--- a/t/primary2.sh
+++ b/t/primary2.sh
diff --git a/t/primary3.sh b/t/primary3.sh
index 0f6d19b58..0f6d19b58 100755..100644
--- a/t/primary3.sh
+++ b/t/primary3.sh
diff --git a/t/print-libdir.sh b/t/print-libdir.sh
index 3f1c295eb..3f1c295eb 100755..100644
--- a/t/print-libdir.sh
+++ b/t/print-libdir.sh
diff --git a/t/proginst.sh b/t/proginst.sh
index 4d8efd491..4d8efd491 100755..100644
--- a/t/proginst.sh
+++ b/t/proginst.sh
diff --git a/t/programs-primary-rewritten.sh b/t/programs-primary-rewritten.sh
index c091e5927..c091e5927 100755..100644
--- a/t/programs-primary-rewritten.sh
+++ b/t/programs-primary-rewritten.sh
diff --git a/t/py-compile-basedir.sh b/t/py-compile-basedir.sh
index 2675361ec..2675361ec 100755..100644
--- a/t/py-compile-basedir.sh
+++ b/t/py-compile-basedir.sh
diff --git a/t/py-compile-basic.sh b/t/py-compile-basic.sh
index 440171ea7..440171ea7 100755..100644
--- a/t/py-compile-basic.sh
+++ b/t/py-compile-basic.sh
diff --git a/t/py-compile-destdir.sh b/t/py-compile-destdir.sh
index becd8ace1..becd8ace1 100755..100644
--- a/t/py-compile-destdir.sh
+++ b/t/py-compile-destdir.sh
diff --git a/t/py-compile-env.sh b/t/py-compile-env.sh
index 2a84127d3..2a84127d3 100755..100644
--- a/t/py-compile-env.sh
+++ b/t/py-compile-env.sh
diff --git a/t/py-compile-option-terminate.sh b/t/py-compile-option-terminate.sh
index ba36afe7d..ba36afe7d 100755..100644
--- a/t/py-compile-option-terminate.sh
+++ b/t/py-compile-option-terminate.sh
diff --git a/t/py-compile-usage.sh b/t/py-compile-usage.sh
index c52ded6fc..c52ded6fc 100755..100644
--- a/t/py-compile-usage.sh
+++ b/t/py-compile-usage.sh
diff --git a/t/python-am-path-iftrue.sh b/t/python-am-path-iftrue.sh
index e70f5f964..e70f5f964 100755..100644
--- a/t/python-am-path-iftrue.sh
+++ b/t/python-am-path-iftrue.sh
diff --git a/t/python-dist.sh b/t/python-dist.sh
index bca821db9..bca821db9 100755..100644
--- a/t/python-dist.sh
+++ b/t/python-dist.sh
diff --git a/t/python-missing.sh b/t/python-missing.sh
index 0a9a07381..66eca9e15 100755..100644
--- a/t/python-missing.sh
+++ b/t/python-missing.sh
@@ -22,7 +22,7 @@ am_create_testdir=empty
 # An actual python is *not* required in this test.
 . test-init.sh
 
-PYTHON=; unset PYTHON
+unset PYTHON
 
 cat > configure.ac <<END
 AC_INIT([$me], [1.0])
diff --git a/t/python-pr10995.sh b/t/python-pr10995.sh
index aa0f00c26..aa0f00c26 100755..100644
--- a/t/python-pr10995.sh
+++ b/t/python-pr10995.sh
diff --git a/t/python-too-old.sh b/t/python-too-old.sh
index 6a81215a3..0042799fa 100755..100644
--- a/t/python-too-old.sh
+++ b/t/python-too-old.sh
@@ -35,7 +35,7 @@ py_too_old ()
 }
 
 saved_PYTHON=$PYTHON; export saved_PYTHON
-PYTHON=; unset PYTHON
+unset PYTHON
 
 cat > configure.ac <<END
 AC_INIT([$me], [1.0])
diff --git a/t/python-vars.sh b/t/python-vars.sh
index 6a21a9330..6a21a9330 100755..100644
--- a/t/python-vars.sh
+++ b/t/python-vars.sh
diff --git a/t/python-virtualenv.sh b/t/python-virtualenv.sh
index a5eec420f..a5eec420f 100755..100644
--- a/t/python-virtualenv.sh
+++ b/t/python-virtualenv.sh
diff --git a/t/python.sh b/t/python.sh
index 377a9091f..377a9091f 100755..100644
--- a/t/python.sh
+++ b/t/python.sh
diff --git a/t/python10.sh b/t/python10.sh
index c44077bf8..c44077bf8 100755..100644
--- a/t/python10.sh
+++ b/t/python10.sh
diff --git a/t/python11.sh b/t/python11.sh
index c5fedf796..faf09d8ff 100755..100644
--- a/t/python11.sh
+++ b/t/python11.sh
@@ -20,7 +20,7 @@
 . test-init.sh
 
 # We don't want to allow user overrides in this test.
-PYTHON=; unset PYTHON
+unset PYTHON
 
 cat >>configure.ac <<'EOF'
 m4_define([_AM_PYTHON_INTERPRETER_LIST], [IShouldNotExist1 IShouldNotExist2])
diff --git a/t/python12.sh b/t/python12.sh
index e93fcb30f..e93fcb30f 100755..100644
--- a/t/python12.sh
+++ b/t/python12.sh
diff --git a/t/python2.sh b/t/python2.sh
index 0e986cf47..0e986cf47 100755..100644
--- a/t/python2.sh
+++ b/t/python2.sh
diff --git a/t/python3.sh b/t/python3.sh
index d2c8797e7..d2c8797e7 100755..100644
--- a/t/python3.sh
+++ b/t/python3.sh
diff --git a/t/recurs-user-deeply-nested.sh b/t/recurs-user-deeply-nested.sh
index 396cf0961..396cf0961 100755..100644
--- a/t/recurs-user-deeply-nested.sh
+++ b/t/recurs-user-deeply-nested.sh
diff --git a/t/recurs-user-indir.sh b/t/recurs-user-indir.sh
index cfdf6d530..cfdf6d530 100755..100644
--- a/t/recurs-user-indir.sh
+++ b/t/recurs-user-indir.sh
diff --git a/t/recurs-user-keep-going.sh b/t/recurs-user-keep-going.sh
index b3ebc0107..b3ebc0107 100755..100644
--- a/t/recurs-user-keep-going.sh
+++ b/t/recurs-user-keep-going.sh
diff --git a/t/recurs-user-many.sh b/t/recurs-user-many.sh
index 05990045e..05990045e 100755..100644
--- a/t/recurs-user-many.sh
+++ b/t/recurs-user-many.sh
diff --git a/t/recurs-user-no-subdirs.sh b/t/recurs-user-no-subdirs.sh
index 9f8c8b6e3..9f8c8b6e3 100755..100644
--- a/t/recurs-user-no-subdirs.sh
+++ b/t/recurs-user-no-subdirs.sh
diff --git a/t/recurs-user-no-top-level.sh b/t/recurs-user-no-top-level.sh
index 8de3ec2cb..8de3ec2cb 100755..100644
--- a/t/recurs-user-no-top-level.sh
+++ b/t/recurs-user-no-top-level.sh
diff --git a/t/recurs-user-override.sh b/t/recurs-user-override.sh
index b551df48a..b551df48a 100755..100644
--- a/t/recurs-user-override.sh
+++ b/t/recurs-user-override.sh
diff --git a/t/recurs-user-phony.sh b/t/recurs-user-phony.sh
index 9f326c925..9f326c925 100755..100644
--- a/t/recurs-user-phony.sh
+++ b/t/recurs-user-phony.sh
diff --git a/t/recurs-user-wrap.sh b/t/recurs-user-wrap.sh
index b4d50dfd8..b4d50dfd8 100755..100644
--- a/t/recurs-user-wrap.sh
+++ b/t/recurs-user-wrap.sh
diff --git a/t/recurs-user.sh b/t/recurs-user.sh
index 00112ac25..00112ac25 100755..100644
--- a/t/recurs-user.sh
+++ b/t/recurs-user.sh
diff --git a/t/recurs-user2.sh b/t/recurs-user2.sh
index 1a85da65a..1a85da65a 100755..100644
--- a/t/recurs-user2.sh
+++ b/t/recurs-user2.sh
diff --git a/t/relativize.tap b/t/relativize.tap
index 1ba286310..1ba286310 100755..100644
--- a/t/relativize.tap
+++ b/t/relativize.tap
diff --git a/t/remake-aclocal-version-mismatch.sh b/t/remake-aclocal-version-mismatch.sh
index cb4086445..cb4086445 100755..100644
--- a/t/remake-aclocal-version-mismatch.sh
+++ b/t/remake-aclocal-version-mismatch.sh
diff --git a/t/remake-after-acinclude-m4.sh b/t/remake-after-acinclude-m4.sh
index a06ff29dd..a06ff29dd 100755..100644
--- a/t/remake-after-acinclude-m4.sh
+++ b/t/remake-after-acinclude-m4.sh
diff --git a/t/remake-after-aclocal-m4.sh b/t/remake-after-aclocal-m4.sh
index d01a8b650..d01a8b650 100755..100644
--- a/t/remake-after-aclocal-m4.sh
+++ b/t/remake-after-aclocal-m4.sh
diff --git a/t/remake-after-configure-ac.sh b/t/remake-after-configure-ac.sh
index b96ae2ae5..b96ae2ae5 100755..100644
--- a/t/remake-after-configure-ac.sh
+++ b/t/remake-after-configure-ac.sh
diff --git a/t/remake-after-makefile-am.sh b/t/remake-after-makefile-am.sh
index f88e5c6b4..f88e5c6b4 100755..100644
--- a/t/remake-after-makefile-am.sh
+++ b/t/remake-after-makefile-am.sh
diff --git a/t/remake-all-1.sh b/t/remake-all-1.sh
index 57022bae2..57022bae2 100755..100644
--- a/t/remake-all-1.sh
+++ b/t/remake-all-1.sh
diff --git a/t/remake-am-pr10111.sh b/t/remake-am-pr10111.sh
index 1514207cf..1514207cf 100755..100644
--- a/t/remake-am-pr10111.sh
+++ b/t/remake-am-pr10111.sh
diff --git a/t/remake-config-status-dependencies.sh b/t/remake-config-status-dependencies.sh
index 6fc9ee8ad..6fc9ee8ad 100755..100644
--- a/t/remake-config-status-dependencies.sh
+++ b/t/remake-config-status-dependencies.sh
diff --git a/t/remake-configure-dependencies.sh b/t/remake-configure-dependencies.sh
index c24a8ca63..c24a8ca63 100755..100644
--- a/t/remake-configure-dependencies.sh
+++ b/t/remake-configure-dependencies.sh
diff --git a/t/remake-deeply-nested.sh b/t/remake-deeply-nested.sh
index d17fd5774..e054c204a 100755..100644
--- a/t/remake-deeply-nested.sh
+++ b/t/remake-deeply-nested.sh
@@ -30,7 +30,7 @@ echo "AC_SUBST([FOO], [$magic1])" >> configure.ac
 
 echo "@FOO@" > bar.in
 echo "AC_CONFIG_FILES([bar])" >> configure.ac
-d=; unset d # Avoid unduly interferences from the environment.
+unset d # Avoid unduly interferences from the environment.
 for i in 0 1 2 3 4 5 6 7 8 9; do
   d=${d+"$d/"}sub$i
   echo "SUBDIRS = sub$i" > Makefile.am
diff --git a/t/remake-deleted-am-2.sh b/t/remake-deleted-am-2.sh
index 8a316eea2..8a316eea2 100755..100644
--- a/t/remake-deleted-am-2.sh
+++ b/t/remake-deleted-am-2.sh
diff --git a/t/remake-deleted-am-subdir.sh b/t/remake-deleted-am-subdir.sh
index 488e26950..488e26950 100755..100644
--- a/t/remake-deleted-am-subdir.sh
+++ b/t/remake-deleted-am-subdir.sh
diff --git a/t/remake-deleted-am.sh b/t/remake-deleted-am.sh
index 1216c12fd..1216c12fd 100755..100644
--- a/t/remake-deleted-am.sh
+++ b/t/remake-deleted-am.sh
diff --git a/t/remake-deleted-m4-file.sh b/t/remake-deleted-m4-file.sh
index cb23417d8..cb23417d8 100755..100644
--- a/t/remake-deleted-m4-file.sh
+++ b/t/remake-deleted-m4-file.sh
diff --git a/t/remake-fail.sh b/t/remake-fail.sh
index cc9530103..cc9530103 100755..100644
--- a/t/remake-fail.sh
+++ b/t/remake-fail.sh
diff --git a/t/remake-gnulib-add-acsubst.sh b/t/remake-gnulib-add-acsubst.sh
index 6b7bb5e9b..6b7bb5e9b 100755..100644
--- a/t/remake-gnulib-add-acsubst.sh
+++ b/t/remake-gnulib-add-acsubst.sh
diff --git a/t/remake-gnulib-add-header.sh b/t/remake-gnulib-add-header.sh
index 2db719bf2..2db719bf2 100755..100644
--- a/t/remake-gnulib-add-header.sh
+++ b/t/remake-gnulib-add-header.sh
diff --git a/t/remake-gnulib-remove-header.sh b/t/remake-gnulib-remove-header.sh
index 6ea768496..6ea768496 100755..100644
--- a/t/remake-gnulib-remove-header.sh
+++ b/t/remake-gnulib-remove-header.sh
diff --git a/t/remake-include-aclocal.sh b/t/remake-include-aclocal.sh
index 8fd9cd346..8fd9cd346 100755..100644
--- a/t/remake-include-aclocal.sh
+++ b/t/remake-include-aclocal.sh
diff --git a/t/remake-include-configure.sh b/t/remake-include-configure.sh
index 7a3ac39ee..7a3ac39ee 100755..100644
--- a/t/remake-include-configure.sh
+++ b/t/remake-include-configure.sh
diff --git a/t/remake-include-makefile.sh b/t/remake-include-makefile.sh
index 399a0ee93..399a0ee93 100755..100644
--- a/t/remake-include-makefile.sh
+++ b/t/remake-include-makefile.sh
diff --git a/t/remake-m4-pr10111.sh b/t/remake-m4-pr10111.sh
index be0d42cd1..be0d42cd1 100755..100644
--- a/t/remake-m4-pr10111.sh
+++ b/t/remake-m4-pr10111.sh
diff --git a/t/remake-macrodir.sh b/t/remake-macrodir.sh
index c736e2688..c736e2688 100755..100644
--- a/t/remake-macrodir.sh
+++ b/t/remake-macrodir.sh
diff --git a/t/remake-makefile-intree.sh b/t/remake-makefile-intree.sh
index 396edc879..396edc879 100755..100644
--- a/t/remake-makefile-intree.sh
+++ b/t/remake-makefile-intree.sh
diff --git a/t/remake-makefile-vpath.sh b/t/remake-makefile-vpath.sh
index b1274bc2a..b1274bc2a 100755..100644
--- a/t/remake-makefile-vpath.sh
+++ b/t/remake-makefile-vpath.sh
diff --git a/t/remake-mild-stress.sh b/t/remake-mild-stress.sh
index 93f3c50a5..93f3c50a5 100755..100644
--- a/t/remake-mild-stress.sh
+++ b/t/remake-mild-stress.sh
diff --git a/t/remake-moved-m4-file.sh b/t/remake-moved-m4-file.sh
index 9271b99d0..9271b99d0 100755..100644
--- a/t/remake-moved-m4-file.sh
+++ b/t/remake-moved-m4-file.sh
diff --git a/t/remake-not-after-make-dist.sh b/t/remake-not-after-make-dist.sh
index 8328491d0..8328491d0 100755..100644
--- a/t/remake-not-after-make-dist.sh
+++ b/t/remake-not-after-make-dist.sh
diff --git a/t/remake-recurs-user.sh b/t/remake-recurs-user.sh
index 5ceb60845..5ceb60845 100755..100644
--- a/t/remake-recurs-user.sh
+++ b/t/remake-recurs-user.sh
diff --git a/t/remake-renamed-am.sh b/t/remake-renamed-am.sh
index 0945d48d8..0945d48d8 100755..100644
--- a/t/remake-renamed-am.sh
+++ b/t/remake-renamed-am.sh
diff --git a/t/remake-renamed-m4-file.sh b/t/remake-renamed-m4-file.sh
index 9702e8b90..9702e8b90 100755..100644
--- a/t/remake-renamed-m4-file.sh
+++ b/t/remake-renamed-m4-file.sh
diff --git a/t/remake-renamed-m4-macro-and-file.sh b/t/remake-renamed-m4-macro-and-file.sh
index befbceacb..befbceacb 100755..100644
--- a/t/remake-renamed-m4-macro-and-file.sh
+++ b/t/remake-renamed-m4-macro-and-file.sh
diff --git a/t/remake-renamed-m4-macro.sh b/t/remake-renamed-m4-macro.sh
index 2002d18f9..2002d18f9 100755..100644
--- a/t/remake-renamed-m4-macro.sh
+++ b/t/remake-renamed-m4-macro.sh
diff --git a/t/remake-subdir-from-subdir.sh b/t/remake-subdir-from-subdir.sh
index ad9fcd1ef..ad9fcd1ef 100755..100644
--- a/t/remake-subdir-from-subdir.sh
+++ b/t/remake-subdir-from-subdir.sh
diff --git a/t/remake-subdir-gnu.sh b/t/remake-subdir-gnu.sh
index 1486274a3..1486274a3 100755..100644
--- a/t/remake-subdir-gnu.sh
+++ b/t/remake-subdir-gnu.sh
diff --git a/t/remake-subdir-grepping.sh b/t/remake-subdir-grepping.sh
index 7de0d4f5d..7de0d4f5d 100755..100644
--- a/t/remake-subdir-grepping.sh
+++ b/t/remake-subdir-grepping.sh
diff --git a/t/remake-subdir-long-time.sh b/t/remake-subdir-long-time.sh
index bd2f249ca..bd2f249ca 100755..100644
--- a/t/remake-subdir-long-time.sh
+++ b/t/remake-subdir-long-time.sh
diff --git a/t/remake-subdir-no-makefile.sh b/t/remake-subdir-no-makefile.sh
index 71f1ebf31..71f1ebf31 100755..100644
--- a/t/remake-subdir-no-makefile.sh
+++ b/t/remake-subdir-no-makefile.sh
diff --git a/t/remake-subdir-only.sh b/t/remake-subdir-only.sh
index c3987da51..c3987da51 100755..100644
--- a/t/remake-subdir-only.sh
+++ b/t/remake-subdir-only.sh
diff --git a/t/remake-subdir.sh b/t/remake-subdir.sh
index 42a947513..42a947513 100755..100644
--- a/t/remake-subdir.sh
+++ b/t/remake-subdir.sh
diff --git a/t/remake-subdir3.sh b/t/remake-subdir3.sh
index f1dbc54c6..f1dbc54c6 100755..100644
--- a/t/remake-subdir3.sh
+++ b/t/remake-subdir3.sh
diff --git a/t/remake-timing-bug-pr8365.sh b/t/remake-timing-bug-pr8365.sh
index 5cae62ef0..5cae62ef0 100755..100644
--- a/t/remake-timing-bug-pr8365.sh
+++ b/t/remake-timing-bug-pr8365.sh
diff --git a/t/repeated-options.sh b/t/repeated-options.sh
index c3fbc27d3..c3fbc27d3 100755..100644
--- a/t/repeated-options.sh
+++ b/t/repeated-options.sh
diff --git a/t/reqd2.sh b/t/reqd2.sh
index 5cefd4fee..5cefd4fee 100755..100644
--- a/t/reqd2.sh
+++ b/t/reqd2.sh
diff --git a/t/rm-f-probe.sh b/t/rm-f-probe.sh
index 1cb220aa0..1cb220aa0 100755..100644
--- a/t/rm-f-probe.sh
+++ b/t/rm-f-probe.sh
diff --git a/t/rulepat.sh b/t/rulepat.sh
index 9255bedaf..9255bedaf 100755..100644
--- a/t/rulepat.sh
+++ b/t/rulepat.sh
diff --git a/t/sanity.sh b/t/sanity.sh
index 60daeec14..60daeec14 100755..100644
--- a/t/sanity.sh
+++ b/t/sanity.sh
diff --git a/t/seenc.sh b/t/seenc.sh
index 3106e3540..3106e3540 100755..100644
--- a/t/seenc.sh
+++ b/t/seenc.sh
diff --git a/t/self-check-cc-no-c-o.sh b/t/self-check-cc-no-c-o.sh
index 69809b77f..69809b77f 100755..100644
--- a/t/self-check-cc-no-c-o.sh
+++ b/t/self-check-cc-no-c-o.sh
diff --git a/t/self-check-configure-help.sh b/t/self-check-configure-help.sh
index 8aa4f3915..8aa4f3915 100755..100644
--- a/t/self-check-configure-help.sh
+++ b/t/self-check-configure-help.sh
diff --git a/t/self-check-dir.tap b/t/self-check-dir.tap
index 2dd13cf64..de1f19c80 100755..100644
--- a/t/self-check-dir.tap
+++ b/t/self-check-dir.tap
@@ -24,7 +24,7 @@ am_create_testdir=no
 
 plan_ 5
 
-keep_testdirs=; unset keep_testdirs
+unset keep_testdirs
 
 # This needs to be consistent with what $AM_TEST_RUNNER_SHELL
 # deems to be the current working directory.
diff --git a/t/self-check-exit.tap b/t/self-check-exit.tap
index d0ee0269e..d0ee0269e 100755..100644
--- a/t/self-check-exit.tap
+++ b/t/self-check-exit.tap
diff --git a/t/self-check-explicit-skips.sh b/t/self-check-explicit-skips.sh
index ba36450bd..ba36450bd 100755..100644
--- a/t/self-check-explicit-skips.sh
+++ b/t/self-check-explicit-skips.sh
diff --git a/t/self-check-is-blocked-signal.tap b/t/self-check-is-blocked-signal.tap
index e3826590a..e3826590a 100755..100644
--- a/t/self-check-is-blocked-signal.tap
+++ b/t/self-check-is-blocked-signal.tap
diff --git a/t/self-check-is_newest.tap b/t/self-check-is_newest.tap
index de1dd669b..de1dd669b 100755..100644
--- a/t/self-check-is_newest.tap
+++ b/t/self-check-is_newest.tap
diff --git a/t/self-check-me.tap b/t/self-check-me.tap
index b2b24f9c5..b2b24f9c5 100755..100644
--- a/t/self-check-me.tap
+++ b/t/self-check-me.tap
diff --git a/t/self-check-report.sh b/t/self-check-report.sh
index c52c5672f..99b98387b 100755..100644
--- a/t/self-check-report.sh
+++ b/t/self-check-report.sh
@@ -18,7 +18,7 @@
 # Test subroutines to report warnings, and to signal failures, skips
 # and hard errors.
 
-unset stderr_fileno_ || :
+unset stderr_fileno_
 
 am_create_testdir=empty
 . test-init.sh
diff --git a/t/self-check-seq.tap b/t/self-check-seq.tap
index 3c5e2dc6c..4e9d58f75 100755..100644
--- a/t/self-check-seq.tap
+++ b/t/self-check-seq.tap
@@ -21,7 +21,7 @@
 
 plan_ 14
 
-unset stderr_fileno_ || :
+unset stderr_fileno_
 
 check_work ()
 {
diff --git a/t/self-check-shell-no-trail-bslash.sh b/t/self-check-shell-no-trail-bslash.sh
index 42738d91b..42738d91b 100755..100644
--- a/t/self-check-shell-no-trail-bslash.sh
+++ b/t/self-check-shell-no-trail-bslash.sh
diff --git a/t/self-check-unindent.tap b/t/self-check-unindent.tap
index ed96993db..ed96993db 100755..100644
--- a/t/self-check-unindent.tap
+++ b/t/self-check-unindent.tap
diff --git a/t/serial-tests.sh b/t/serial-tests.sh
index d20d693e6..d20d693e6 100755..100644
--- a/t/serial-tests.sh
+++ b/t/serial-tests.sh
diff --git a/t/silent-c.sh b/t/silent-c.sh
index 77c72c44f..77c72c44f 100755..100644
--- a/t/silent-c.sh
+++ b/t/silent-c.sh
diff --git a/t/silent-configsite.sh b/t/silent-configsite.sh
index f76d41933..7979617e6 100755..100644
--- a/t/silent-configsite.sh
+++ b/t/silent-configsite.sh
@@ -33,7 +33,7 @@ test-nosilent:
 	$(AM_V_P); test $$? -eq 0
 EOF
 
-unset enable_silent_rules || :
+unset enable_silent_rules
 
 : 'No explicit default in configure.ac, enable by default in config.site'
 
diff --git a/t/silent-custom.sh b/t/silent-custom.sh
index fc117df78..fc117df78 100755..100644
--- a/t/silent-custom.sh
+++ b/t/silent-custom.sh
diff --git a/t/silent-cxx.sh b/t/silent-cxx.sh
index c2a87040f..c2a87040f 100755..100644
--- a/t/silent-cxx.sh
+++ b/t/silent-cxx.sh
diff --git a/t/silent-f77.sh b/t/silent-f77.sh
index c0447ede1..c0447ede1 100755..100644
--- a/t/silent-f77.sh
+++ b/t/silent-f77.sh
diff --git a/t/silent-f90.sh b/t/silent-f90.sh
index b40b47af6..b40b47af6 100755..100644
--- a/t/silent-f90.sh
+++ b/t/silent-f90.sh
diff --git a/t/silent-gen.sh b/t/silent-gen.sh
index 930dc5851..930dc5851 100755..100644
--- a/t/silent-gen.sh
+++ b/t/silent-gen.sh
diff --git a/t/silent-lex.sh b/t/silent-lex.sh
index 20d4c7caa..20d4c7caa 100755..100644
--- a/t/silent-lex.sh
+++ b/t/silent-lex.sh
diff --git a/t/silent-lt.sh b/t/silent-lt.sh
index 3d3023edc..3d3023edc 100755..100644
--- a/t/silent-lt.sh
+++ b/t/silent-lt.sh
diff --git a/t/silent-many-languages.sh b/t/silent-many-languages.sh
index f3c11d79e..f3c11d79e 100755..100644
--- a/t/silent-many-languages.sh
+++ b/t/silent-many-languages.sh
diff --git a/t/silent-texi.sh b/t/silent-texi.sh
index 810fb04a6..810fb04a6 100755..100644
--- a/t/silent-texi.sh
+++ b/t/silent-texi.sh
diff --git a/t/silent-yacc-headers.sh b/t/silent-yacc-headers.sh
index 87a8ec451..87a8ec451 100755..100644
--- a/t/silent-yacc-headers.sh
+++ b/t/silent-yacc-headers.sh
diff --git a/t/silent-yacc.sh b/t/silent-yacc.sh
index eba36b54f..eba36b54f 100755..100644
--- a/t/silent-yacc.sh
+++ b/t/silent-yacc.sh
diff --git a/t/space.sh b/t/space.sh
index 43507fec8..43507fec8 100755..100644
--- a/t/space.sh
+++ b/t/space.sh
diff --git a/t/specflg-dummy.sh b/t/specflg-dummy.sh
index 56a1c1fae..56a1c1fae 100755..100644
--- a/t/specflg-dummy.sh
+++ b/t/specflg-dummy.sh
diff --git a/t/specflg6.sh b/t/specflg6.sh
index 5e30fa7c0..5e30fa7c0 100755..100644
--- a/t/specflg6.sh
+++ b/t/specflg6.sh
diff --git a/t/specflg7.sh b/t/specflg7.sh
index 0a40b5deb..0a40b5deb 100755..100644
--- a/t/specflg7.sh
+++ b/t/specflg7.sh
diff --git a/t/specflg8.sh b/t/specflg8.sh
index 5e51053ce..5e51053ce 100755..100644
--- a/t/specflg8.sh
+++ b/t/specflg8.sh
diff --git a/t/specflg9.sh b/t/specflg9.sh
index 4f3d3b0c2..4f3d3b0c2 100755..100644
--- a/t/specflg9.sh
+++ b/t/specflg9.sh
diff --git a/t/spell.sh b/t/spell.sh
index a5f49ce0a..a5f49ce0a 100755..100644
--- a/t/spell.sh
+++ b/t/spell.sh
diff --git a/t/spell2.sh b/t/spell2.sh
index b50c3d7dc..b50c3d7dc 100755..100644
--- a/t/spell2.sh
+++ b/t/spell2.sh
diff --git a/t/spell3.sh b/t/spell3.sh
index 35403ccad..35403ccad 100755..100644
--- a/t/spell3.sh
+++ b/t/spell3.sh
diff --git a/t/spelling.sh b/t/spelling.sh
index 7410aea58..7410aea58 100755..100644
--- a/t/spelling.sh
+++ b/t/spelling.sh
diff --git a/t/spy-autovars.sh b/t/spy-autovars.sh
index 8ff66de72..8ff66de72 100755..100644
--- a/t/spy-autovars.sh
+++ b/t/spy-autovars.sh
diff --git a/t/spy-foreach.sh b/t/spy-foreach.sh
index 7608a5cea..7608a5cea 100755..100644
--- a/t/spy-foreach.sh
+++ b/t/spy-foreach.sh
diff --git a/t/spy-pattern-rules.sh b/t/spy-pattern-rules.sh
index 507d584c5..507d584c5 100755..100644
--- a/t/spy-pattern-rules.sh
+++ b/t/spy-pattern-rules.sh
diff --git a/t/spy-phony.sh b/t/spy-phony.sh
index 705419e19..705419e19 100755..100644
--- a/t/spy-phony.sh
+++ b/t/spy-phony.sh
diff --git a/t/spy-rm.tap b/t/spy-rm.tap
index 3b8dd2d10..3b8dd2d10 100755..100644
--- a/t/spy-rm.tap
+++ b/t/spy-rm.tap
diff --git a/t/spy-trailing-backlash.sh b/t/spy-trailing-backlash.sh
index a918cffdf..a918cffdf 100755..100644
--- a/t/spy-trailing-backlash.sh
+++ b/t/spy-trailing-backlash.sh
diff --git a/t/spy-var-append.sh b/t/spy-var-append.sh
index 0d5482ba1..0d5482ba1 100755..100644
--- a/t/spy-var-append.sh
+++ b/t/spy-var-append.sh
diff --git a/t/spy-vpath-rewrite.sh b/t/spy-vpath-rewrite.sh
index 4981bbf4e..4981bbf4e 100755..100644
--- a/t/spy-vpath-rewrite.sh
+++ b/t/spy-vpath-rewrite.sh
diff --git a/t/spy-wildcard.sh b/t/spy-wildcard.sh
index 608f158d3..608f158d3 100755..100644
--- a/t/spy-wildcard.sh
+++ b/t/spy-wildcard.sh
diff --git a/t/src-acsubst.sh b/t/src-acsubst.sh
index b013f5847..b013f5847 100755..100644
--- a/t/src-acsubst.sh
+++ b/t/src-acsubst.sh
diff --git a/t/stamph2.sh b/t/stamph2.sh
index 60349c5e8..60349c5e8 100755..100644
--- a/t/stamph2.sh
+++ b/t/stamph2.sh
diff --git a/t/stdinc-no-repeated.sh b/t/stdinc-no-repeated.sh
index 40b855d4e..40b855d4e 100755..100644
--- a/t/stdinc-no-repeated.sh
+++ b/t/stdinc-no-repeated.sh
diff --git a/t/stdinc.sh b/t/stdinc.sh
index 947313c03..947313c03 100755..100644
--- a/t/stdinc.sh
+++ b/t/stdinc.sh
diff --git a/t/stdlib.sh b/t/stdlib.sh
index 887b3871b..887b3871b 100755..100644
--- a/t/stdlib.sh
+++ b/t/stdlib.sh
diff --git a/t/stdlib2.sh b/t/stdlib2.sh
index a16e7847d..a16e7847d 100755..100644
--- a/t/stdlib2.sh
+++ b/t/stdlib2.sh
diff --git a/t/strictness-override.sh b/t/strictness-override.sh
index 98451ce1d..98451ce1d 100755..100644
--- a/t/strictness-override.sh
+++ b/t/strictness-override.sh
diff --git a/t/strictness-precedence.sh b/t/strictness-precedence.sh
index f578d04f9..f578d04f9 100755..100644
--- a/t/strictness-precedence.sh
+++ b/t/strictness-precedence.sh
diff --git a/t/strip.sh b/t/strip.sh
index 9c9998d1c..9c9998d1c 100755..100644
--- a/t/strip.sh
+++ b/t/strip.sh
diff --git a/t/strip2.sh b/t/strip2.sh
index 63d3c4010..63d3c4010 100755..100644
--- a/t/strip2.sh
+++ b/t/strip2.sh
diff --git a/t/strip3.sh b/t/strip3.sh
index 97f9e3ef9..97f9e3ef9 100755..100644
--- a/t/strip3.sh
+++ b/t/strip3.sh
diff --git a/t/subdir-ac-subst.sh b/t/subdir-ac-subst.sh
index d3f50bc92..d3f50bc92 100755..100644
--- a/t/subdir-ac-subst.sh
+++ b/t/subdir-ac-subst.sh
diff --git a/t/subdir-add-pr46.sh b/t/subdir-add-pr46.sh
index e2c58ce32..e2c58ce32 100755..100644
--- a/t/subdir-add-pr46.sh
+++ b/t/subdir-add-pr46.sh
diff --git a/t/subdir-add2-pr46.sh b/t/subdir-add2-pr46.sh
index 5f5f0b361..5f5f0b361 100755..100644
--- a/t/subdir-add2-pr46.sh
+++ b/t/subdir-add2-pr46.sh
diff --git a/t/subdir-am-cond.sh b/t/subdir-am-cond.sh
index 8a36bc36d..8a36bc36d 100755..100644
--- a/t/subdir-am-cond.sh
+++ b/t/subdir-am-cond.sh
diff --git a/t/subdir-cond-err.sh b/t/subdir-cond-err.sh
index 19bd15332..19bd15332 100755..100644
--- a/t/subdir-cond-err.sh
+++ b/t/subdir-cond-err.sh
diff --git a/t/subdir-cond-gettext.sh b/t/subdir-cond-gettext.sh
index 60a62ab87..60a62ab87 100755..100644
--- a/t/subdir-cond-gettext.sh
+++ b/t/subdir-cond-gettext.sh
diff --git a/t/subdir-distclean.sh b/t/subdir-distclean.sh
index 1274b2a44..1274b2a44 100755..100644
--- a/t/subdir-distclean.sh
+++ b/t/subdir-distclean.sh
diff --git a/t/subdir-env-interference.sh b/t/subdir-env-interference.sh
index 9c349e15f..9c349e15f 100755..100644
--- a/t/subdir-env-interference.sh
+++ b/t/subdir-env-interference.sh
diff --git a/t/subdir-keep-going-pr12554.sh b/t/subdir-keep-going-pr12554.sh
index 03d5cb048..03d5cb048 100755..100644
--- a/t/subdir-keep-going-pr12554.sh
+++ b/t/subdir-keep-going-pr12554.sh
diff --git a/t/subdir-order.sh b/t/subdir-order.sh
index 3775a8cbd..3775a8cbd 100755..100644
--- a/t/subdir-order.sh
+++ b/t/subdir-order.sh
diff --git a/t/subdir-subsub.sh b/t/subdir-subsub.sh
index e2f44c7c5..e2f44c7c5 100755..100644
--- a/t/subdir-subsub.sh
+++ b/t/subdir-subsub.sh
diff --git a/t/subdir-with-slash.sh b/t/subdir-with-slash.sh
index 17dca91a3..17dca91a3 100755..100644
--- a/t/subdir-with-slash.sh
+++ b/t/subdir-with-slash.sh
diff --git a/t/subdir.sh b/t/subdir.sh
index f33aefcb8..f33aefcb8 100755..100644
--- a/t/subdir.sh
+++ b/t/subdir.sh
diff --git a/t/subobj-c.sh b/t/subobj-c.sh
index e0c2ad2aa..e0c2ad2aa 100755..100644
--- a/t/subobj-c.sh
+++ b/t/subobj-c.sh
diff --git a/t/subobj-clean-lt-pr10697.sh b/t/subobj-clean-lt-pr10697.sh
index bd1357612..bd1357612 100755..100644
--- a/t/subobj-clean-lt-pr10697.sh
+++ b/t/subobj-clean-lt-pr10697.sh
diff --git a/t/subobj-clean-pr10697.sh b/t/subobj-clean-pr10697.sh
index 4b732ab21..4b732ab21 100755..100644
--- a/t/subobj-clean-pr10697.sh
+++ b/t/subobj-clean-pr10697.sh
diff --git a/t/subobj-cxx-grep.sh b/t/subobj-cxx-grep.sh
index 7c3065b69..7c3065b69 100755..100644
--- a/t/subobj-cxx-grep.sh
+++ b/t/subobj-cxx-grep.sh
diff --git a/t/subobj-cxx.sh b/t/subobj-cxx.sh
index 18641da71..18641da71 100755..100644
--- a/t/subobj-cxx.sh
+++ b/t/subobj-cxx.sh
diff --git a/t/subobj-libtool.sh b/t/subobj-libtool.sh
index 2011d6153..2011d6153 100755..100644
--- a/t/subobj-libtool.sh
+++ b/t/subobj-libtool.sh
diff --git a/t/subobj10.sh b/t/subobj10.sh
index bc1af3145..bc1af3145 100755..100644
--- a/t/subobj10.sh
+++ b/t/subobj10.sh
diff --git a/t/subobj11a.sh b/t/subobj11a.sh
index 33d03d0a8..33d03d0a8 100755..100644
--- a/t/subobj11a.sh
+++ b/t/subobj11a.sh
diff --git a/t/subobj5.sh b/t/subobj5.sh
index 17c60fd74..17c60fd74 100755..100644
--- a/t/subobj5.sh
+++ b/t/subobj5.sh
diff --git a/t/subobj7.sh b/t/subobj7.sh
index de73cc2dc..de73cc2dc 100755..100644
--- a/t/subobj7.sh
+++ b/t/subobj7.sh
diff --git a/t/subobj8.sh b/t/subobj8.sh
index 99d0e1ba1..99d0e1ba1 100755..100644
--- a/t/subobj8.sh
+++ b/t/subobj8.sh
diff --git a/t/subobj9.sh b/t/subobj9.sh
index e7932fe78..e7932fe78 100755..100644
--- a/t/subobj9.sh
+++ b/t/subobj9.sh
diff --git a/t/subobjname.sh b/t/subobjname.sh
index 515d3d7e0..515d3d7e0 100755..100644
--- a/t/subobjname.sh
+++ b/t/subobjname.sh
diff --git a/t/subpkg-macrodir.sh b/t/subpkg-macrodir.sh
index 275a32cd7..275a32cd7 100755..100644
--- a/t/subpkg-macrodir.sh
+++ b/t/subpkg-macrodir.sh
diff --git a/t/subpkg-yacc.sh b/t/subpkg-yacc.sh
index fc637ccb1..724cb8945 100755..100644
--- a/t/subpkg-yacc.sh
+++ b/t/subpkg-yacc.sh
@@ -114,7 +114,9 @@ $ACLOCAL
 $AUTOCONF
 $AUTOMAKE -a
 
-test ! -f ylwrap
+test ! -e ylwrap
+test ! -e ar-lib
+
 cd lib
 $ACLOCAL
 $AUTOCONF
@@ -122,6 +124,7 @@ $AUTOHEADER
 $AUTOMAKE --add-missing
 cd ..
 test -f ylwrap
+test -f ar-lib
 
 ./configure
 
diff --git a/t/subpkg.sh b/t/subpkg.sh
index d7f117a06..d7f117a06 100755..100644
--- a/t/subpkg.sh
+++ b/t/subpkg.sh
diff --git a/t/subpkg2.sh b/t/subpkg2.sh
index 7800ad003..7800ad003 100755..100644
--- a/t/subpkg2.sh
+++ b/t/subpkg2.sh
diff --git a/t/subpkg3.sh b/t/subpkg3.sh
index 4b85c1390..4b85c1390 100755..100644
--- a/t/subpkg3.sh
+++ b/t/subpkg3.sh
diff --git a/t/subpkg4.sh b/t/subpkg4.sh
index e28e79507..e28e79507 100755..100644
--- a/t/subpkg4.sh
+++ b/t/subpkg4.sh
diff --git a/t/subst.sh b/t/subst.sh
index a7ebe7dcf..a7ebe7dcf 100755..100644
--- a/t/subst.sh
+++ b/t/subst.sh
diff --git a/t/subst3.sh b/t/subst3.sh
index 3654b83f7..3654b83f7 100755..100644
--- a/t/subst3.sh
+++ b/t/subst3.sh
diff --git a/t/subst4.sh b/t/subst4.sh
index 1034affea..1034affea 100755..100644
--- a/t/subst4.sh
+++ b/t/subst4.sh
diff --git a/t/subst5.sh b/t/subst5.sh
index dd0a4e73f..dd0a4e73f 100755..100644
--- a/t/subst5.sh
+++ b/t/subst5.sh
diff --git a/t/substre2.sh b/t/substre2.sh
index 39f4f2c52..39f4f2c52 100755..100644
--- a/t/substre2.sh
+++ b/t/substre2.sh
diff --git a/t/substref.sh b/t/substref.sh
index b323271db..b323271db 100755..100644
--- a/t/substref.sh
+++ b/t/substref.sh
diff --git a/t/substtarg.sh b/t/substtarg.sh
index fed1ba9c3..fed1ba9c3 100755..100644
--- a/t/substtarg.sh
+++ b/t/substtarg.sh
diff --git a/t/suffix-chain.sh b/t/suffix-chain.sh
index 06014653a..06014653a 100755..100644
--- a/t/suffix-chain.sh
+++ b/t/suffix-chain.sh
diff --git a/t/suffix-custom-default-ext.sh b/t/suffix-custom-default-ext.sh
index 36823d357..36823d357 100755..100644
--- a/t/suffix-custom-default-ext.sh
+++ b/t/suffix-custom-default-ext.sh
diff --git a/t/suffix-custom-link.sh b/t/suffix-custom-link.sh
index 31c1d6662..31c1d6662 100755..100644
--- a/t/suffix-custom-link.sh
+++ b/t/suffix-custom-link.sh
diff --git a/t/suffix-custom-subobj-and-specflg.sh b/t/suffix-custom-subobj-and-specflg.sh
index 298a74e9e..298a74e9e 100755..100644
--- a/t/suffix-custom-subobj-and-specflg.sh
+++ b/t/suffix-custom-subobj-and-specflg.sh
diff --git a/t/suffix-custom-subobj.sh b/t/suffix-custom-subobj.sh
index d66f70814..d66f70814 100755..100644
--- a/t/suffix-custom-subobj.sh
+++ b/t/suffix-custom-subobj.sh
diff --git a/t/suffix-custom.sh b/t/suffix-custom.sh
index 51fc30e54..51fc30e54 100755..100644
--- a/t/suffix-custom.sh
+++ b/t/suffix-custom.sh
diff --git a/t/suffix-hdr.sh b/t/suffix-hdr.sh
index f2d61013c..f2d61013c 100755..100644
--- a/t/suffix-hdr.sh
+++ b/t/suffix-hdr.sh
diff --git a/t/suffix-obj.sh b/t/suffix-obj.sh
index 81781c032..81781c032 100755..100644
--- a/t/suffix-obj.sh
+++ b/t/suffix-obj.sh
diff --git a/t/suffix-rules-old-fashioned.sh b/t/suffix-rules-old-fashioned.sh
index 114b5e824..114b5e824 100755..100644
--- a/t/suffix-rules-old-fashioned.sh
+++ b/t/suffix-rules-old-fashioned.sh
diff --git a/t/suffix.sh b/t/suffix.sh
index 91b708087..91b708087 100755..100644
--- a/t/suffix.sh
+++ b/t/suffix.sh
diff --git a/t/suffix10.sh b/t/suffix10.sh
index 503f51d89..503f51d89 100755..100644
--- a/t/suffix10.sh
+++ b/t/suffix10.sh
diff --git a/t/suffix2.sh b/t/suffix2.sh
index d5fe188ed..d5fe188ed 100755..100644
--- a/t/suffix2.sh
+++ b/t/suffix2.sh
diff --git a/t/suffix3.sh b/t/suffix3.sh
index 09926cee9..09926cee9 100755..100644
--- a/t/suffix3.sh
+++ b/t/suffix3.sh
diff --git a/t/suffix5.sh b/t/suffix5.sh
index 66b3aabf8..66b3aabf8 100755..100644
--- a/t/suffix5.sh
+++ b/t/suffix5.sh
diff --git a/t/suffix8.sh b/t/suffix8.sh
index 22ebc8f16..22ebc8f16 100755..100644
--- a/t/suffix8.sh
+++ b/t/suffix8.sh
diff --git a/t/suffix9.sh b/t/suffix9.sh
index cdaeed821..cdaeed821 100755..100644
--- a/t/suffix9.sh
+++ b/t/suffix9.sh
diff --git a/t/symlink.sh b/t/symlink.sh
index 86b8d5b7c..86b8d5b7c 100755..100644
--- a/t/symlink.sh
+++ b/t/symlink.sh
diff --git a/t/symlink2.sh b/t/symlink2.sh
index af88cab10..af88cab10 100755..100644
--- a/t/symlink2.sh
+++ b/t/symlink2.sh
diff --git a/t/tags-id.sh b/t/tags-id.sh
index da8aed8b9..da8aed8b9 100755..100644
--- a/t/tags-id.sh
+++ b/t/tags-id.sh
diff --git a/t/tags-pr12372.sh b/t/tags-pr12372.sh
index 0ddebd9a0..0ddebd9a0 100755..100644
--- a/t/tags-pr12372.sh
+++ b/t/tags-pr12372.sh
diff --git a/t/tap-ambiguous-directive.sh b/t/tap-ambiguous-directive.sh
index 6804e6742..6804e6742 100755..100644
--- a/t/tap-ambiguous-directive.sh
+++ b/t/tap-ambiguous-directive.sh
diff --git a/t/tap-autonumber.sh b/t/tap-autonumber.sh
index c07772e9a..c07772e9a 100755..100644
--- a/t/tap-autonumber.sh
+++ b/t/tap-autonumber.sh
diff --git a/t/tap-bad-prog.tap b/t/tap-bad-prog.tap
index ed38bb492..ed38bb492 100755..100644
--- a/t/tap-bad-prog.tap
+++ b/t/tap-bad-prog.tap
diff --git a/t/tap-bailout-and-logging.sh b/t/tap-bailout-and-logging.sh
index 9ac565735..9ac565735 100755..100644
--- a/t/tap-bailout-and-logging.sh
+++ b/t/tap-bailout-and-logging.sh
diff --git a/t/tap-bailout-leading-space.sh b/t/tap-bailout-leading-space.sh
index 76f6f9311..76f6f9311 100755..100644
--- a/t/tap-bailout-leading-space.sh
+++ b/t/tap-bailout-leading-space.sh
diff --git a/t/tap-bailout-suppress-badexit.sh b/t/tap-bailout-suppress-badexit.sh
index 1a10b8383..1a10b8383 100755..100644
--- a/t/tap-bailout-suppress-badexit.sh
+++ b/t/tap-bailout-suppress-badexit.sh
diff --git a/t/tap-bailout-suppress-later-diagnostic.sh b/t/tap-bailout-suppress-later-diagnostic.sh
index 3045e1d35..3045e1d35 100755..100644
--- a/t/tap-bailout-suppress-later-diagnostic.sh
+++ b/t/tap-bailout-suppress-later-diagnostic.sh
diff --git a/t/tap-bailout-suppress-later-errors.sh b/t/tap-bailout-suppress-later-errors.sh
index a653cfcd4..a653cfcd4 100755..100644
--- a/t/tap-bailout-suppress-later-errors.sh
+++ b/t/tap-bailout-suppress-later-errors.sh
diff --git a/t/tap-bailout.sh b/t/tap-bailout.sh
index 40f5d9da1..40f5d9da1 100755..100644
--- a/t/tap-bailout.sh
+++ b/t/tap-bailout.sh
diff --git a/t/tap-basic.sh b/t/tap-basic.sh
index 6b97ecbd7..6b97ecbd7 100755..100644
--- a/t/tap-basic.sh
+++ b/t/tap-basic.sh
diff --git a/t/tap-color.sh b/t/tap-color.sh
index 9ad871293..9ad871293 100755..100644
--- a/t/tap-color.sh
+++ b/t/tap-color.sh
diff --git a/t/tap-common-setup.sh b/t/tap-common-setup.sh
index a6a78db45..a6a78db45 100755..100644
--- a/t/tap-common-setup.sh
+++ b/t/tap-common-setup.sh
diff --git a/t/tap-deps.sh b/t/tap-deps.sh
index 5aadd807b..5aadd807b 100755..100644
--- a/t/tap-deps.sh
+++ b/t/tap-deps.sh
diff --git a/t/tap-diagnostic-custom.sh b/t/tap-diagnostic-custom.sh
index 4cefead40..4cefead40 100755..100644
--- a/t/tap-diagnostic-custom.sh
+++ b/t/tap-diagnostic-custom.sh
diff --git a/t/tap-diagnostic.sh b/t/tap-diagnostic.sh
index 22f6bf7a1..22f6bf7a1 100755..100644
--- a/t/tap-diagnostic.sh
+++ b/t/tap-diagnostic.sh
diff --git a/t/tap-doc.sh b/t/tap-doc.sh
index 1253bf5da..1253bf5da 100755..100644
--- a/t/tap-doc.sh
+++ b/t/tap-doc.sh
diff --git a/t/tap-doc2.sh b/t/tap-doc2.sh
index b06fa3a70..b06fa3a70 100755..100644
--- a/t/tap-doc2.sh
+++ b/t/tap-doc2.sh
diff --git a/t/tap-driver-stderr.sh b/t/tap-driver-stderr.sh
index 32799b7f8..32799b7f8 100755..100644
--- a/t/tap-driver-stderr.sh
+++ b/t/tap-driver-stderr.sh
diff --git a/t/tap-empty-diagnostic.sh b/t/tap-empty-diagnostic.sh
index 4a6f2b127..4a6f2b127 100755..100644
--- a/t/tap-empty-diagnostic.sh
+++ b/t/tap-empty-diagnostic.sh
diff --git a/t/tap-empty.sh b/t/tap-empty.sh
index 7943f1dcd..7943f1dcd 100755..100644
--- a/t/tap-empty.sh
+++ b/t/tap-empty.sh
diff --git a/t/tap-escape-directive-2.sh b/t/tap-escape-directive-2.sh
index 135df29f9..135df29f9 100755..100644
--- a/t/tap-escape-directive-2.sh
+++ b/t/tap-escape-directive-2.sh
diff --git a/t/tap-escape-directive.sh b/t/tap-escape-directive.sh
index daf766c76..daf766c76 100755..100644
--- a/t/tap-escape-directive.sh
+++ b/t/tap-escape-directive.sh
diff --git a/t/tap-exit.sh b/t/tap-exit.sh
index 9e0937d75..9e0937d75 100755..100644
--- a/t/tap-exit.sh
+++ b/t/tap-exit.sh
diff --git a/t/tap-fancy.sh b/t/tap-fancy.sh
index 724dd1bd1..724dd1bd1 100755..100644
--- a/t/tap-fancy.sh
+++ b/t/tap-fancy.sh
diff --git a/t/tap-fancy2.sh b/t/tap-fancy2.sh
index 1e53c2b69..1e53c2b69 100755..100644
--- a/t/tap-fancy2.sh
+++ b/t/tap-fancy2.sh
diff --git a/t/tap-global-log.sh b/t/tap-global-log.sh
index c25040d42..c25040d42 100755..100644
--- a/t/tap-global-log.sh
+++ b/t/tap-global-log.sh
diff --git a/t/tap-global-result.sh b/t/tap-global-result.sh
index 53d4513de..53d4513de 100755..100644
--- a/t/tap-global-result.sh
+++ b/t/tap-global-result.sh
diff --git a/t/tap-lazy-check.sh b/t/tap-lazy-check.sh
index 15e83ee66..15e83ee66 100755..100644
--- a/t/tap-lazy-check.sh
+++ b/t/tap-lazy-check.sh
diff --git a/t/tap-log.sh b/t/tap-log.sh
index d3432c8cd..d3432c8cd 100755..100644
--- a/t/tap-log.sh
+++ b/t/tap-log.sh
diff --git a/t/tap-merge-stdout-stderr.sh b/t/tap-merge-stdout-stderr.sh
index bc44f4791..bc44f4791 100755..100644
--- a/t/tap-merge-stdout-stderr.sh
+++ b/t/tap-merge-stdout-stderr.sh
diff --git a/t/tap-missing-plan-and-bad-exit.sh b/t/tap-missing-plan-and-bad-exit.sh
index 45b2413e1..45b2413e1 100755..100644
--- a/t/tap-missing-plan-and-bad-exit.sh
+++ b/t/tap-missing-plan-and-bad-exit.sh
diff --git a/t/tap-more.sh b/t/tap-more.sh
index eed0f5eb7..eed0f5eb7 100755..100644
--- a/t/tap-more.sh
+++ b/t/tap-more.sh
diff --git a/t/tap-more2.sh b/t/tap-more2.sh
index 5c4d43f0f..5c4d43f0f 100755..100644
--- a/t/tap-more2.sh
+++ b/t/tap-more2.sh
diff --git a/t/tap-msg0-bailout.sh b/t/tap-msg0-bailout.sh
index 2b1e216de..2b1e216de 100755..100644
--- a/t/tap-msg0-bailout.sh
+++ b/t/tap-msg0-bailout.sh
diff --git a/t/tap-msg0-directive.sh b/t/tap-msg0-directive.sh
index a73515304..a73515304 100755..100644
--- a/t/tap-msg0-directive.sh
+++ b/t/tap-msg0-directive.sh
diff --git a/t/tap-msg0-misc.sh b/t/tap-msg0-misc.sh
index e1f48a945..e1f48a945 100755..100644
--- a/t/tap-msg0-misc.sh
+++ b/t/tap-msg0-misc.sh
diff --git a/t/tap-msg0-planskip.sh b/t/tap-msg0-planskip.sh
index f7111b990..f7111b990 100755..100644
--- a/t/tap-msg0-planskip.sh
+++ b/t/tap-msg0-planskip.sh
diff --git a/t/tap-msg0-result.sh b/t/tap-msg0-result.sh
index cdadd4057..cdadd4057 100755..100644
--- a/t/tap-msg0-result.sh
+++ b/t/tap-msg0-result.sh
diff --git a/t/tap-negative-numbers.sh b/t/tap-negative-numbers.sh
index 0a04fdbe5..0a04fdbe5 100755..100644
--- a/t/tap-negative-numbers.sh
+++ b/t/tap-negative-numbers.sh
diff --git a/t/tap-no-disable-hard-error.sh b/t/tap-no-disable-hard-error.sh
index 99b2f49fb..99b2f49fb 100755..100644
--- a/t/tap-no-disable-hard-error.sh
+++ b/t/tap-no-disable-hard-error.sh
diff --git a/t/tap-no-merge-stdout-stderr.sh b/t/tap-no-merge-stdout-stderr.sh
index 4ce486992..4ce486992 100755..100644
--- a/t/tap-no-merge-stdout-stderr.sh
+++ b/t/tap-no-merge-stdout-stderr.sh
diff --git a/t/tap-no-spurious-numbers.sh b/t/tap-no-spurious-numbers.sh
index 57c5ddcff..57c5ddcff 100755..100644
--- a/t/tap-no-spurious-numbers.sh
+++ b/t/tap-no-spurious-numbers.sh
diff --git a/t/tap-no-spurious.sh b/t/tap-no-spurious.sh
index 8d4552900..8d4552900 100755..100644
--- a/t/tap-no-spurious.sh
+++ b/t/tap-no-spurious.sh
diff --git a/t/tap-not-ok-skip.sh b/t/tap-not-ok-skip.sh
index 4ad1d4244..4ad1d4244 100755..100644
--- a/t/tap-not-ok-skip.sh
+++ b/t/tap-not-ok-skip.sh
diff --git a/t/tap-number-wordboundary.sh b/t/tap-number-wordboundary.sh
index a8e9f1c49..a8e9f1c49 100755..100644
--- a/t/tap-number-wordboundary.sh
+++ b/t/tap-number-wordboundary.sh
diff --git a/t/tap-numbers-leading-zero.sh b/t/tap-numbers-leading-zero.sh
index 32c252e68..32c252e68 100755..100644
--- a/t/tap-numbers-leading-zero.sh
+++ b/t/tap-numbers-leading-zero.sh
diff --git a/t/tap-numeric-description.sh b/t/tap-numeric-description.sh
index a007af588..a007af588 100755..100644
--- a/t/tap-numeric-description.sh
+++ b/t/tap-numeric-description.sh
diff --git a/t/tap-out-of-order.sh b/t/tap-out-of-order.sh
index 1b6cd9291..1b6cd9291 100755..100644
--- a/t/tap-out-of-order.sh
+++ b/t/tap-out-of-order.sh
diff --git a/t/tap-passthrough-exit.sh b/t/tap-passthrough-exit.sh
index 1f65bfab5..1f65bfab5 100755..100644
--- a/t/tap-passthrough-exit.sh
+++ b/t/tap-passthrough-exit.sh
diff --git a/t/tap-passthrough.sh b/t/tap-passthrough.sh
index 7d35e0dc0..7d35e0dc0 100755..100644
--- a/t/tap-passthrough.sh
+++ b/t/tap-passthrough.sh
diff --git a/t/tap-plan-corner.sh b/t/tap-plan-corner.sh
index c9e7e4296..c9e7e4296 100755..100644
--- a/t/tap-plan-corner.sh
+++ b/t/tap-plan-corner.sh
diff --git a/t/tap-plan-errors.sh b/t/tap-plan-errors.sh
index bc0d0189e..bc0d0189e 100755..100644
--- a/t/tap-plan-errors.sh
+++ b/t/tap-plan-errors.sh
diff --git a/t/tap-plan-leading-zero.sh b/t/tap-plan-leading-zero.sh
index 70c10e6c7..70c10e6c7 100755..100644
--- a/t/tap-plan-leading-zero.sh
+++ b/t/tap-plan-leading-zero.sh
diff --git a/t/tap-plan-malformed.sh b/t/tap-plan-malformed.sh
index 145f39c87..145f39c87 100755..100644
--- a/t/tap-plan-malformed.sh
+++ b/t/tap-plan-malformed.sh
diff --git a/t/tap-plan-middle.sh b/t/tap-plan-middle.sh
index 2e82a44f7..2e82a44f7 100755..100644
--- a/t/tap-plan-middle.sh
+++ b/t/tap-plan-middle.sh
diff --git a/t/tap-plan-whitespace.sh b/t/tap-plan-whitespace.sh
index 4efb720b5..4efb720b5 100755..100644
--- a/t/tap-plan-whitespace.sh
+++ b/t/tap-plan-whitespace.sh
diff --git a/t/tap-plan.sh b/t/tap-plan.sh
index 57cea05a7..57cea05a7 100755..100644
--- a/t/tap-plan.sh
+++ b/t/tap-plan.sh
diff --git a/t/tap-planskip-and-logging.sh b/t/tap-planskip-and-logging.sh
index 8227e8723..8227e8723 100755..100644
--- a/t/tap-planskip-and-logging.sh
+++ b/t/tap-planskip-and-logging.sh
diff --git a/t/tap-planskip-badexit.sh b/t/tap-planskip-badexit.sh
index d02d184bd..d02d184bd 100755..100644
--- a/t/tap-planskip-badexit.sh
+++ b/t/tap-planskip-badexit.sh
diff --git a/t/tap-planskip-bailout.sh b/t/tap-planskip-bailout.sh
index 655d1c9c1..655d1c9c1 100755..100644
--- a/t/tap-planskip-bailout.sh
+++ b/t/tap-planskip-bailout.sh
diff --git a/t/tap-planskip-case-insensitive.sh b/t/tap-planskip-case-insensitive.sh
index 646885c59..646885c59 100755..100644
--- a/t/tap-planskip-case-insensitive.sh
+++ b/t/tap-planskip-case-insensitive.sh
diff --git a/t/tap-planskip-late.sh b/t/tap-planskip-late.sh
index 56e6e7182..56e6e7182 100755..100644
--- a/t/tap-planskip-late.sh
+++ b/t/tap-planskip-late.sh
diff --git a/t/tap-planskip-later-errors.sh b/t/tap-planskip-later-errors.sh
index e924c135a..e924c135a 100755..100644
--- a/t/tap-planskip-later-errors.sh
+++ b/t/tap-planskip-later-errors.sh
diff --git a/t/tap-planskip-unplanned-corner.sh b/t/tap-planskip-unplanned-corner.sh
index f5e7b6a67..f5e7b6a67 100755..100644
--- a/t/tap-planskip-unplanned-corner.sh
+++ b/t/tap-planskip-unplanned-corner.sh
diff --git a/t/tap-planskip-unplanned.sh b/t/tap-planskip-unplanned.sh
index 07ed54435..07ed54435 100755..100644
--- a/t/tap-planskip-unplanned.sh
+++ b/t/tap-planskip-unplanned.sh
diff --git a/t/tap-planskip-whitespace.sh b/t/tap-planskip-whitespace.sh
index c9b132996..c9b132996 100755..100644
--- a/t/tap-planskip-whitespace.sh
+++ b/t/tap-planskip-whitespace.sh
diff --git a/t/tap-planskip.sh b/t/tap-planskip.sh
index a7dba868c..a7dba868c 100755..100644
--- a/t/tap-planskip.sh
+++ b/t/tap-planskip.sh
diff --git a/t/tap-realtime.sh b/t/tap-realtime.sh
index 11395bf04..11395bf04 100755..100644
--- a/t/tap-realtime.sh
+++ b/t/tap-realtime.sh
diff --git a/t/tap-recheck.sh b/t/tap-recheck.sh
index af3966d14..af3966d14 100755..100644
--- a/t/tap-recheck.sh
+++ b/t/tap-recheck.sh
diff --git a/t/tap-result-comment.sh b/t/tap-result-comment.sh
index 6c14506d0..6c14506d0 100755..100644
--- a/t/tap-result-comment.sh
+++ b/t/tap-result-comment.sh
diff --git a/t/tap-signal.tap b/t/tap-signal.tap
index 10a53a2f2..10a53a2f2 100755..100644
--- a/t/tap-signal.tap
+++ b/t/tap-signal.tap
diff --git a/t/tap-summary-color.sh b/t/tap-summary-color.sh
index 121cb3ef6..121cb3ef6 100755..100644
--- a/t/tap-summary-color.sh
+++ b/t/tap-summary-color.sh
diff --git a/t/tap-summary.sh b/t/tap-summary.sh
index d9690aac8..d9690aac8 100755..100644
--- a/t/tap-summary.sh
+++ b/t/tap-summary.sh
diff --git a/t/tap-test-number-0.sh b/t/tap-test-number-0.sh
index a657ef35c..a657ef35c 100755..100644
--- a/t/tap-test-number-0.sh
+++ b/t/tap-test-number-0.sh
diff --git a/t/tap-todo-skip-together.sh b/t/tap-todo-skip-together.sh
index c9a339ee1..c9a339ee1 100755..100644
--- a/t/tap-todo-skip-together.sh
+++ b/t/tap-todo-skip-together.sh
diff --git a/t/tap-todo-skip-whitespace.sh b/t/tap-todo-skip-whitespace.sh
index c4c47d916..c4c47d916 100755..100644
--- a/t/tap-todo-skip-whitespace.sh
+++ b/t/tap-todo-skip-whitespace.sh
diff --git a/t/tap-todo-skip.sh b/t/tap-todo-skip.sh
index a9b3c5d7e..a9b3c5d7e 100755..100644
--- a/t/tap-todo-skip.sh
+++ b/t/tap-todo-skip.sh
diff --git a/t/tap-unplanned.sh b/t/tap-unplanned.sh
index 4039939b4..4039939b4 100755..100644
--- a/t/tap-unplanned.sh
+++ b/t/tap-unplanned.sh
diff --git a/t/tap-whitespace-normalization.sh b/t/tap-whitespace-normalization.sh
index 8ed732803..8ed732803 100755..100644
--- a/t/tap-whitespace-normalization.sh
+++ b/t/tap-whitespace-normalization.sh
diff --git a/t/tap-with-and-without-number.sh b/t/tap-with-and-without-number.sh
index 87e4872a2..87e4872a2 100755..100644
--- a/t/tap-with-and-without-number.sh
+++ b/t/tap-with-and-without-number.sh
diff --git a/t/tap-xfail-tests.sh b/t/tap-xfail-tests.sh
index 79bde3082..79bde3082 100755..100644
--- a/t/tap-xfail-tests.sh
+++ b/t/tap-xfail-tests.sh
diff --git a/t/tar-opts-errors.sh b/t/tar-opts-errors.sh
index befc23f7e..befc23f7e 100755..100644
--- a/t/tar-opts-errors.sh
+++ b/t/tar-opts-errors.sh
diff --git a/t/tar-override.sh b/t/tar-override.sh
index bbf3fbb86..d5bbd5676 100755..100644
--- a/t/tar-override.sh
+++ b/t/tar-override.sh
@@ -59,7 +59,7 @@ test "$(cat am--tar-has-run)" = foo
 
 clean_temp
 
-TAR=; unset TAR
+unset TAR
 # Creative use of eval to pacify maintainer checks.
 eval \$'MAKE dist "TAR=./am--tar mu"'
 test -f $distdir.tar.gz
diff --git a/t/tar-pax.sh b/t/tar-pax.sh
index 758d89a7d..758d89a7d 100755..100644
--- a/t/tar-pax.sh
+++ b/t/tar-pax.sh
diff --git a/t/tar-ustar-id-too-high.sh b/t/tar-ustar-id-too-high.sh
index 79ae89d85..79ae89d85 100755..100644
--- a/t/tar-ustar-id-too-high.sh
+++ b/t/tar-ustar-id-too-high.sh
diff --git a/t/tar-ustar.sh b/t/tar-ustar.sh
index c146ad98a..c146ad98a 100755..100644
--- a/t/tar-ustar.sh
+++ b/t/tar-ustar.sh
diff --git a/t/target-cflags.sh b/t/target-cflags.sh
index 01bcbce93..01bcbce93 100755..100644
--- a/t/target-cflags.sh
+++ b/t/target-cflags.sh
diff --git a/t/targetclash.sh b/t/targetclash.sh
index 4f4b04e4d..4f4b04e4d 100755..100644
--- a/t/targetclash.sh
+++ b/t/targetclash.sh
diff --git a/t/test-driver-acsubst.sh b/t/test-driver-acsubst.sh
index 031888235..031888235 100755..100644
--- a/t/test-driver-acsubst.sh
+++ b/t/test-driver-acsubst.sh
diff --git a/t/test-driver-cond.sh b/t/test-driver-cond.sh
index 8dab7a771..8dab7a771 100755..100644
--- a/t/test-driver-cond.sh
+++ b/t/test-driver-cond.sh
diff --git a/t/test-driver-create-log-dir.sh b/t/test-driver-create-log-dir.sh
index fce21402d..fce21402d 100755..100644
--- a/t/test-driver-create-log-dir.sh
+++ b/t/test-driver-create-log-dir.sh
diff --git a/t/test-driver-custom-multitest-recheck.sh b/t/test-driver-custom-multitest-recheck.sh
index 155b37e59..155b37e59 100755..100644
--- a/t/test-driver-custom-multitest-recheck.sh
+++ b/t/test-driver-custom-multitest-recheck.sh
diff --git a/t/test-driver-custom-multitest-recheck2.sh b/t/test-driver-custom-multitest-recheck2.sh
index f1c455a1f..f1c455a1f 100755..100644
--- a/t/test-driver-custom-multitest-recheck2.sh
+++ b/t/test-driver-custom-multitest-recheck2.sh
diff --git a/t/test-driver-custom-multitest.sh b/t/test-driver-custom-multitest.sh
index 09693a15c..09693a15c 100755..100644
--- a/t/test-driver-custom-multitest.sh
+++ b/t/test-driver-custom-multitest.sh
diff --git a/t/test-driver-custom-xfail-tests.sh b/t/test-driver-custom-xfail-tests.sh
index 6f5498eb7..6f5498eb7 100755..100644
--- a/t/test-driver-custom-xfail-tests.sh
+++ b/t/test-driver-custom-xfail-tests.sh
diff --git a/t/test-driver-custom.sh b/t/test-driver-custom.sh
index 1081f859d..1081f859d 100755..100644
--- a/t/test-driver-custom.sh
+++ b/t/test-driver-custom.sh
diff --git a/t/test-driver-fail.sh b/t/test-driver-fail.sh
index c9c1a4ee8..c9c1a4ee8 100755..100644
--- a/t/test-driver-fail.sh
+++ b/t/test-driver-fail.sh
diff --git a/t/test-driver-is-distributed.sh b/t/test-driver-is-distributed.sh
index d271f2739..d271f2739 100755..100644
--- a/t/test-driver-is-distributed.sh
+++ b/t/test-driver-is-distributed.sh
diff --git a/t/test-driver-strip-vpath.sh b/t/test-driver-strip-vpath.sh
index 5eb5d24f3..5eb5d24f3 100755..100644
--- a/t/test-driver-strip-vpath.sh
+++ b/t/test-driver-strip-vpath.sh
diff --git a/t/test-extensions-cond.sh b/t/test-extensions-cond.sh
index 8834b0a55..8834b0a55 100755..100644
--- a/t/test-extensions-cond.sh
+++ b/t/test-extensions-cond.sh
diff --git a/t/test-extensions-dynamic.sh b/t/test-extensions-dynamic.sh
index 57cc43fae..57cc43fae 100755..100644
--- a/t/test-extensions-dynamic.sh
+++ b/t/test-extensions-dynamic.sh
diff --git a/t/test-extensions-funny-chars.sh b/t/test-extensions-funny-chars.sh
index a3a06a216..a3a06a216 100755..100644
--- a/t/test-extensions-funny-chars.sh
+++ b/t/test-extensions-funny-chars.sh
diff --git a/t/test-extensions-invalid.sh b/t/test-extensions-invalid.sh
index fba3aff1f..fba3aff1f 100755..100644
--- a/t/test-extensions-invalid.sh
+++ b/t/test-extensions-invalid.sh
diff --git a/t/test-harness-vpath-rewrite.sh b/t/test-harness-vpath-rewrite.sh
index d300f97de..d300f97de 100755..100644
--- a/t/test-harness-vpath-rewrite.sh
+++ b/t/test-harness-vpath-rewrite.sh
diff --git a/t/test-log.sh b/t/test-log.sh
index d36fab628..d36fab628 100755..100644
--- a/t/test-log.sh
+++ b/t/test-log.sh
diff --git a/t/test-logs-repeated.sh b/t/test-logs-repeated.sh
index 28957b236..28957b236 100755..100644
--- a/t/test-logs-repeated.sh
+++ b/t/test-logs-repeated.sh
diff --git a/t/test-metadata-global-log.sh b/t/test-metadata-global-log.sh
index 1a46abb54..1a46abb54 100755..100644
--- a/t/test-metadata-global-log.sh
+++ b/t/test-metadata-global-log.sh
diff --git a/t/test-metadata-global-result.sh b/t/test-metadata-global-result.sh
index 0f1ae9fdc..0f1ae9fdc 100755..100644
--- a/t/test-metadata-global-result.sh
+++ b/t/test-metadata-global-result.sh
diff --git a/t/test-metadata-recheck.sh b/t/test-metadata-recheck.sh
index 958abd2e0..958abd2e0 100755..100644
--- a/t/test-metadata-recheck.sh
+++ b/t/test-metadata-recheck.sh
diff --git a/t/test-metadata-results.sh b/t/test-metadata-results.sh
index 0981befb2..0981befb2 100755..100644
--- a/t/test-metadata-results.sh
+++ b/t/test-metadata-results.sh
diff --git a/t/test-missing.sh b/t/test-missing.sh
index b10b4e6c1..b10b4e6c1 100755..100644
--- a/t/test-missing.sh
+++ b/t/test-missing.sh
diff --git a/t/test-trs-basic.sh b/t/test-trs-basic.sh
index 8ddf806de..8ddf806de 100755..100644
--- a/t/test-trs-basic.sh
+++ b/t/test-trs-basic.sh
diff --git a/t/test-trs-recover-parallel.sh b/t/test-trs-recover-parallel.sh
index 50b49aa95..50b49aa95 100755..100644
--- a/t/test-trs-recover-parallel.sh
+++ b/t/test-trs-recover-parallel.sh
diff --git a/t/test-trs-recover.sh b/t/test-trs-recover.sh
index 194db64a8..194db64a8 100755..100644
--- a/t/test-trs-recover.sh
+++ b/t/test-trs-recover.sh
diff --git a/t/tests-environment-and-log-compiler.sh b/t/tests-environment-and-log-compiler.sh
index 283e7d374..5f0e2f527 100755..100644
--- a/t/tests-environment-and-log-compiler.sh
+++ b/t/tests-environment-and-log-compiler.sh
@@ -24,7 +24,7 @@ cat >> configure.ac << 'END'
 AC_OUTPUT
 END
 
-unset v0 v1 v2 v3 v4 || :
+unset v0 v1 v2 v3 v4
 
 cat > Makefile.am << 'END'
 TESTS_ENVIRONMENT = am__f3 () { echo 3; }; v0='$(srcdir)' v1=1; :;
diff --git a/t/tests-environment-backcompat.sh b/t/tests-environment-backcompat.sh
index 3068a0d8c..3068a0d8c 100755..100644
--- a/t/tests-environment-backcompat.sh
+++ b/t/tests-environment-backcompat.sh
diff --git a/t/tests-environment-fd-redirect.sh b/t/tests-environment-fd-redirect.sh
index 243174acb..243174acb 100755..100644
--- a/t/tests-environment-fd-redirect.sh
+++ b/t/tests-environment-fd-redirect.sh
diff --git a/t/tests-environment.sh b/t/tests-environment.sh
index 444067eb2..444067eb2 100755..100644
--- a/t/tests-environment.sh
+++ b/t/tests-environment.sh
diff --git a/t/testsuite-summary-color.sh b/t/testsuite-summary-color.sh
index 10485ba6a..10485ba6a 100755..100644
--- a/t/testsuite-summary-color.sh
+++ b/t/testsuite-summary-color.sh
diff --git a/t/testsuite-summary-count-many.sh b/t/testsuite-summary-count-many.sh
index 29220bb2e..29220bb2e 100755..100644
--- a/t/testsuite-summary-count-many.sh
+++ b/t/testsuite-summary-count-many.sh
diff --git a/t/testsuite-summary-count.sh b/t/testsuite-summary-count.sh
index 7275136ae..7275136ae 100755..100644
--- a/t/testsuite-summary-count.sh
+++ b/t/testsuite-summary-count.sh
diff --git a/t/testsuite-summary-reference-log.sh b/t/testsuite-summary-reference-log.sh
index f90ac390c..f90ac390c 100755..100644
--- a/t/testsuite-summary-reference-log.sh
+++ b/t/testsuite-summary-reference-log.sh
diff --git a/t/transform.sh b/t/transform.sh
index 229ad63ed..229ad63ed 100755..100644
--- a/t/transform.sh
+++ b/t/transform.sh
diff --git a/t/transform2.sh b/t/transform2.sh
index 0da2cb9c9..0da2cb9c9 100755..100644
--- a/t/transform2.sh
+++ b/t/transform2.sh
diff --git a/t/transform3.sh b/t/transform3.sh
index 96ecd71a8..96ecd71a8 100755..100644
--- a/t/transform3.sh
+++ b/t/transform3.sh
diff --git a/t/triplet.sh b/t/triplet.sh
index 9f6d7bb37..9f6d7bb37 100755..100644
--- a/t/triplet.sh
+++ b/t/triplet.sh
diff --git a/t/txinfo-absolute-srcdir-pr408.sh b/t/txinfo-absolute-srcdir-pr408.sh
index 3d7e41d71..3d7e41d71 100755..100644
--- a/t/txinfo-absolute-srcdir-pr408.sh
+++ b/t/txinfo-absolute-srcdir-pr408.sh
diff --git a/t/txinfo-add-missing-and-dist.sh b/t/txinfo-add-missing-and-dist.sh
index fa0624a09..fa0624a09 100755..100644
--- a/t/txinfo-add-missing-and-dist.sh
+++ b/t/txinfo-add-missing-and-dist.sh
diff --git a/t/txinfo-bsd-make-recurs.sh b/t/txinfo-bsd-make-recurs.sh
index 5365c99c4..5365c99c4 100755..100644
--- a/t/txinfo-bsd-make-recurs.sh
+++ b/t/txinfo-bsd-make-recurs.sh
diff --git a/t/txinfo-builddir.sh b/t/txinfo-builddir.sh
index e0156c54d..42d4112d7 100755..100644
--- a/t/txinfo-builddir.sh
+++ b/t/txinfo-builddir.sh
@@ -22,6 +22,10 @@
 required='makeinfo tex texi2dvi'
 . test-init.sh
 
+if useless_vpath_rebuild; then
+  skip_ "$MAKE has brittle VPATH support"
+fi
+
 echo AC_OUTPUT >> configure.ac
 
 cat > Makefile.am << 'END'
@@ -86,38 +90,38 @@ $MAKE info
 test -f foo.info
 test -f subdir/bar.info
 test -f mu.info
-test -f stamp-vti
-test -f version.texi
+test -f ../stamp-vti
+test -f ../version.texi
 test ! -e ../foo.info
 test ! -e ../subdir/bar.info
 test ! -e ../mu.info
-test ! -e ../stamp-vti
-test ! -e ../version.texi
 $MAKE clean
 test -f foo.info
 test -f subdir/bar.info
 test ! -e mu.info
-test -f stamp-vti
-test -f version.texi
+test -f ../stamp-vti
+test -f ../version.texi
 
 # Make sure stamp-vti is older that version.texi.
 # (A common situation in a real tree).
 $sleep
-touch stamp-vti
+touch ../stamp-vti
 
 $MAKE distcheck
 # Being distributed, this file should have been rebuilt.
 test -f mu.info
 
 $MAKE distclean
-test -f stamp-vti
-test -f version.texi
+test -f ../stamp-vti
+test -f ../version.texi
 test -f foo.info
 test -f subdir/bar.info
 test ! -e mu.info
 
 ../configure
 $MAKE maintainer-clean
+test ! -e ../stamp-vti
+test ! -e ../version.texi
 test ! -e stamp-vti
 test ! -e version.texi
 test ! -e foo.info
diff --git a/t/txinfo-clean.sh b/t/txinfo-clean.sh
index 5183811ac..5183811ac 100755..100644
--- a/t/txinfo-clean.sh
+++ b/t/txinfo-clean.sh
diff --git a/t/txinfo-include.sh b/t/txinfo-include.sh
index 8cdf59cfe..8cdf59cfe 100755..100644
--- a/t/txinfo-include.sh
+++ b/t/txinfo-include.sh
diff --git a/t/txinfo-info-in-srcdir.sh b/t/txinfo-info-in-srcdir.sh
index 56d336640..56d336640 100755..100644
--- a/t/txinfo-info-in-srcdir.sh
+++ b/t/txinfo-info-in-srcdir.sh
diff --git a/t/txinfo-makeinfo-error-no-clobber.sh b/t/txinfo-makeinfo-error-no-clobber.sh
index c567e89f0..c567e89f0 100755..100644
--- a/t/txinfo-makeinfo-error-no-clobber.sh
+++ b/t/txinfo-makeinfo-error-no-clobber.sh
diff --git a/t/txinfo-many-output-formats-vpath.sh b/t/txinfo-many-output-formats-vpath.sh
index d6335894b..d6335894b 100755..100644
--- a/t/txinfo-many-output-formats-vpath.sh
+++ b/t/txinfo-many-output-formats-vpath.sh
diff --git a/t/txinfo-many-output-formats.sh b/t/txinfo-many-output-formats.sh
index 82ab8e968..82ab8e968 100755..100644
--- a/t/txinfo-many-output-formats.sh
+++ b/t/txinfo-many-output-formats.sh
diff --git a/t/txinfo-no-clutter.sh b/t/txinfo-no-clutter.sh
index 8cdf7fc45..8cdf7fc45 100755..100644
--- a/t/txinfo-no-clutter.sh
+++ b/t/txinfo-no-clutter.sh
diff --git a/t/txinfo-no-extra-dist.sh b/t/txinfo-no-extra-dist.sh
index d36ac1675..d36ac1675 100755..100644
--- a/t/txinfo-no-extra-dist.sh
+++ b/t/txinfo-no-extra-dist.sh
diff --git a/t/txinfo-no-installinfo.sh b/t/txinfo-no-installinfo.sh
index 17e559e65..17e559e65 100755..100644
--- a/t/txinfo-no-installinfo.sh
+++ b/t/txinfo-no-installinfo.sh
diff --git a/t/txinfo-no-split.sh b/t/txinfo-no-split.sh
index aecf7e735..aecf7e735 100755..100644
--- a/t/txinfo-no-split.sh
+++ b/t/txinfo-no-split.sh
diff --git a/t/txinfo-nodist-info.sh b/t/txinfo-nodist-info.sh
index 265587e4e..265587e4e 100755..100644
--- a/t/txinfo-nodist-info.sh
+++ b/t/txinfo-nodist-info.sh
diff --git a/t/txinfo-override-infodeps.sh b/t/txinfo-override-infodeps.sh
index 9ae09b427..9ae09b427 100755..100644
--- a/t/txinfo-override-infodeps.sh
+++ b/t/txinfo-override-infodeps.sh
diff --git a/t/txinfo-override-texinfo-tex.sh b/t/txinfo-override-texinfo-tex.sh
index 72bf834e2..72bf834e2 100755..100644
--- a/t/txinfo-override-texinfo-tex.sh
+++ b/t/txinfo-override-texinfo-tex.sh
diff --git a/t/txinfo-setfilename-repeated.sh b/t/txinfo-setfilename-repeated.sh
index 04172bd1c..04172bd1c 100755..100644
--- a/t/txinfo-setfilename-repeated.sh
+++ b/t/txinfo-setfilename-repeated.sh
diff --git a/t/txinfo-setfilename-suffix-strip.sh b/t/txinfo-setfilename-suffix-strip.sh
index 85f5d20a1..85f5d20a1 100755..100644
--- a/t/txinfo-setfilename-suffix-strip.sh
+++ b/t/txinfo-setfilename-suffix-strip.sh
diff --git a/t/txinfo-subdir-pr343.sh b/t/txinfo-subdir-pr343.sh
index 73c70df1e..73c70df1e 100755..100644
--- a/t/txinfo-subdir-pr343.sh
+++ b/t/txinfo-subdir-pr343.sh
diff --git a/t/txinfo-tex-dist.sh b/t/txinfo-tex-dist.sh
index 2a099d6fb..2a099d6fb 100755..100644
--- a/t/txinfo-tex-dist.sh
+++ b/t/txinfo-tex-dist.sh
diff --git a/t/txinfo-unrecognized-extension-2.sh b/t/txinfo-unrecognized-extension-2.sh
index 0847e4d30..0847e4d30 100755..100644
--- a/t/txinfo-unrecognized-extension-2.sh
+++ b/t/txinfo-unrecognized-extension-2.sh
diff --git a/t/txinfo-unrecognized-extension.sh b/t/txinfo-unrecognized-extension.sh
index f3112c500..f3112c500 100755..100644
--- a/t/txinfo-unrecognized-extension.sh
+++ b/t/txinfo-unrecognized-extension.sh
diff --git a/t/txinfo-unrecognized-info-suffix.sh b/t/txinfo-unrecognized-info-suffix.sh
index 5836778ce..5836778ce 100755..100644
--- a/t/txinfo-unrecognized-info-suffix.sh
+++ b/t/txinfo-unrecognized-info-suffix.sh
diff --git a/t/txinfo-vtexi.sh b/t/txinfo-vtexi.sh
index 3d7d0ef24..3d7d0ef24 100755..100644
--- a/t/txinfo-vtexi.sh
+++ b/t/txinfo-vtexi.sh
diff --git a/t/txinfo-vtexi2.sh b/t/txinfo-vtexi2.sh
index 72bad5d76..72bad5d76 100755..100644
--- a/t/txinfo-vtexi2.sh
+++ b/t/txinfo-vtexi2.sh
diff --git a/t/txinfo-vtexi3.sh b/t/txinfo-vtexi3.sh
index 76a11a3cf..76a11a3cf 100755..100644
--- a/t/txinfo-vtexi3.sh
+++ b/t/txinfo-vtexi3.sh
diff --git a/t/txinfo-vtexi4.sh b/t/txinfo-vtexi4.sh
index ffbe45c80..ffbe45c80 100755..100644
--- a/t/txinfo-vtexi4.sh
+++ b/t/txinfo-vtexi4.sh
diff --git a/t/txinfo23.sh b/t/txinfo23.sh
index 6c2d9ce3c..6c2d9ce3c 100755..100644
--- a/t/txinfo23.sh
+++ b/t/txinfo23.sh
diff --git a/t/txinfo24.sh b/t/txinfo24.sh
index 9daa82ec7..9daa82ec7 100755..100644
--- a/t/txinfo24.sh
+++ b/t/txinfo24.sh
diff --git a/t/txinfo25.sh b/t/txinfo25.sh
index aad0cb771..aad0cb771 100755..100644
--- a/t/txinfo25.sh
+++ b/t/txinfo25.sh
diff --git a/t/txinfo28.sh b/t/txinfo28.sh
index 191a21849..191a21849 100755..100644
--- a/t/txinfo28.sh
+++ b/t/txinfo28.sh
diff --git a/t/uninstall-fail.sh b/t/uninstall-fail.sh
index 9ee2711c1..9ee2711c1 100755..100644
--- a/t/uninstall-fail.sh
+++ b/t/uninstall-fail.sh
diff --git a/t/uninstall-pr9578.sh b/t/uninstall-pr9578.sh
index 3b3db545b..3b3db545b 100755..100644
--- a/t/uninstall-pr9578.sh
+++ b/t/uninstall-pr9578.sh
diff --git a/t/unused.sh b/t/unused.sh
index 7a0f812b7..7a0f812b7 100755..100644
--- a/t/unused.sh
+++ b/t/unused.sh
diff --git a/t/upc.sh b/t/upc.sh
index 168186c7e..168186c7e 100755..100644
--- a/t/upc.sh
+++ b/t/upc.sh
diff --git a/t/upc2.sh b/t/upc2.sh
index 0924608a3..0924608a3 100755..100644
--- a/t/upc2.sh
+++ b/t/upc2.sh
diff --git a/t/upc3.sh b/t/upc3.sh
index d5d126d6f..d5d126d6f 100755..100644
--- a/t/upc3.sh
+++ b/t/upc3.sh
diff --git a/t/vala-configure.sh b/t/vala-configure.sh
index cbba4bd3d..4f59d070f 100755..100644
--- a/t/vala-configure.sh
+++ b/t/vala-configure.sh
@@ -53,7 +53,7 @@ chmod +x bin/valac.old
 PATH=$(pwd)/bin$PATH_SEPARATOR$PATH; export PATH
 
 # Avoid interferences from the environment.
-VALAC= vala_version=; unset VALAC vala_version
+unset VALAC vala_version
 
 $ACLOCAL
 $AUTOMAKE -a
diff --git a/t/vala-grepping.sh b/t/vala-grepping.sh
index fd16b6bd1..fd16b6bd1 100755..100644
--- a/t/vala-grepping.sh
+++ b/t/vala-grepping.sh
diff --git a/t/vala-headers.sh b/t/vala-headers.sh
index 12791a2d5..12791a2d5 100755..100644
--- a/t/vala-headers.sh
+++ b/t/vala-headers.sh
diff --git a/t/vala-libs.sh b/t/vala-libs.sh
index bd8136eb5..bd8136eb5 100755..100644
--- a/t/vala-libs.sh
+++ b/t/vala-libs.sh
diff --git a/t/vala-mix.sh b/t/vala-mix.sh
index c6d848b15..c6d848b15 100755..100644
--- a/t/vala-mix.sh
+++ b/t/vala-mix.sh
diff --git a/t/vala-mix2.sh b/t/vala-mix2.sh
index f33d4e5bd..f33d4e5bd 100755..100644
--- a/t/vala-mix2.sh
+++ b/t/vala-mix2.sh
diff --git a/t/vala-non-recursive-setup.sh b/t/vala-non-recursive-setup.sh
index 6e35abfa6..6e35abfa6 100755..100644
--- a/t/vala-non-recursive-setup.sh
+++ b/t/vala-non-recursive-setup.sh
diff --git a/t/vala-parallel.sh b/t/vala-parallel.sh
index 1f5e03203..1f5e03203 100755..100644
--- a/t/vala-parallel.sh
+++ b/t/vala-parallel.sh
diff --git a/t/vala-per-target-flags.sh b/t/vala-per-target-flags.sh
index 8ce9787cc..8ce9787cc 100755..100644
--- a/t/vala-per-target-flags.sh
+++ b/t/vala-per-target-flags.sh
diff --git a/t/vala-recursive-setup.sh b/t/vala-recursive-setup.sh
index d9373475b..d9373475b 100755..100644
--- a/t/vala-recursive-setup.sh
+++ b/t/vala-recursive-setup.sh
diff --git a/t/vala-vapi.sh b/t/vala-vapi.sh
index 19b7ee37f..19b7ee37f 100755..100644
--- a/t/vala-vapi.sh
+++ b/t/vala-vapi.sh
diff --git a/t/vala-vpath.sh b/t/vala-vpath.sh
index 664433a66..664433a66 100755..100644
--- a/t/vala-vpath.sh
+++ b/t/vala-vpath.sh
diff --git a/t/var-recurs.sh b/t/var-recurs.sh
index e60a5c0de..e60a5c0de 100755..100644
--- a/t/var-recurs.sh
+++ b/t/var-recurs.sh
diff --git a/t/var-recurs2.sh b/t/var-recurs2.sh
index 809821242..809821242 100755..100644
--- a/t/var-recurs2.sh
+++ b/t/var-recurs2.sh
diff --git a/t/var-undef-append.sh b/t/var-undef-append.sh
index 179170c00..179170c00 100755..100644
--- a/t/var-undef-append.sh
+++ b/t/var-undef-append.sh
diff --git a/t/vars-assign.sh b/t/vars-assign.sh
index ef8e3c056..ef8e3c056 100755..100644
--- a/t/vars-assign.sh
+++ b/t/vars-assign.sh
diff --git a/t/vars.sh b/t/vars.sh
index 0d5927251..0d5927251 100755..100644
--- a/t/vars.sh
+++ b/t/vars.sh
diff --git a/t/vartar.sh b/t/vartar.sh
index 565d06ccf..565d06ccf 100755..100644
--- a/t/vartar.sh
+++ b/t/vartar.sh
diff --git a/t/vartypos-deps.sh b/t/vartypos-deps.sh
index 7837866fa..7837866fa 100755..100644
--- a/t/vartypos-deps.sh
+++ b/t/vartypos-deps.sh
diff --git a/t/vartypos-whitelist.sh b/t/vartypos-whitelist.sh
index ef0e35962..ef0e35962 100755..100644
--- a/t/vartypos-whitelist.sh
+++ b/t/vartypos-whitelist.sh
diff --git a/t/vartypos.sh b/t/vartypos.sh
index 6c22d6470..6c22d6470 100755..100644
--- a/t/vartypos.sh
+++ b/t/vartypos.sh
diff --git a/t/verbatim.sh b/t/verbatim.sh
index a82bf1821..a82bf1821 100755..100644
--- a/t/verbatim.sh
+++ b/t/verbatim.sh
diff --git a/t/version3.sh b/t/version3.sh
index 9ee3c1a1f..9ee3c1a1f 100755..100644
--- a/t/version3.sh
+++ b/t/version3.sh
diff --git a/t/version4.sh b/t/version4.sh
index 58e234d0e..58e234d0e 100755..100644
--- a/t/version4.sh
+++ b/t/version4.sh
diff --git a/t/version6.sh b/t/version6.sh
index b249d4773..b249d4773 100755..100644
--- a/t/version6.sh
+++ b/t/version6.sh
diff --git a/t/version7.sh b/t/version7.sh
index 4cbc8ee52..4cbc8ee52 100755..100644
--- a/t/version7.sh
+++ b/t/version7.sh
diff --git a/t/version8.sh b/t/version8.sh
index f00e6ae31..f00e6ae31 100755..100644
--- a/t/version8.sh
+++ b/t/version8.sh
diff --git a/t/vpath-built-sources.sh b/t/vpath-built-sources.sh
index 3e134e286..3e134e286 100755..100644
--- a/t/vpath-built-sources.sh
+++ b/t/vpath-built-sources.sh
diff --git a/t/vpath-rewrite.sh b/t/vpath-rewrite.sh
index ddade3427..ddade3427 100755..100644
--- a/t/vpath-rewrite.sh
+++ b/t/vpath-rewrite.sh
diff --git a/t/vpath.sh b/t/vpath.sh
index 8447a9dce..8447a9dce 100755..100644
--- a/t/vpath.sh
+++ b/t/vpath.sh
diff --git a/t/warning-groups-win-over-strictness.sh b/t/warning-groups-win-over-strictness.sh
index 5dc9100e2..5dc9100e2 100755..100644
--- a/t/warning-groups-win-over-strictness.sh
+++ b/t/warning-groups-win-over-strictness.sh
diff --git a/t/warnings-obsolete-default.sh b/t/warnings-obsolete-default.sh
index 80be4d110..80be4d110 100755..100644
--- a/t/warnings-obsolete-default.sh
+++ b/t/warnings-obsolete-default.sh
diff --git a/t/warnings-override.sh b/t/warnings-override.sh
index 98d7bf074..98d7bf074 100755..100644
--- a/t/warnings-override.sh
+++ b/t/warnings-override.sh
diff --git a/t/warnings-precedence.sh b/t/warnings-precedence.sh
index 4f984e0c8..4f984e0c8 100755..100644
--- a/t/warnings-precedence.sh
+++ b/t/warnings-precedence.sh
diff --git a/t/warnings-strictness-interactions.sh b/t/warnings-strictness-interactions.sh
index c3206cb2d..c3206cb2d 100755..100644
--- a/t/warnings-strictness-interactions.sh
+++ b/t/warnings-strictness-interactions.sh
diff --git a/t/warnings-unknown.sh b/t/warnings-unknown.sh
index 697484e1b..697484e1b 100755..100644
--- a/t/warnings-unknown.sh
+++ b/t/warnings-unknown.sh
diff --git a/t/warnings-win-over-strictness.sh b/t/warnings-win-over-strictness.sh
index 7a97431b6..7a97431b6 100755..100644
--- a/t/warnings-win-over-strictness.sh
+++ b/t/warnings-win-over-strictness.sh
diff --git a/t/warnopts.sh b/t/warnopts.sh
index c8a3a6e3f..c8a3a6e3f 100755..100644
--- a/t/warnopts.sh
+++ b/t/warnopts.sh
diff --git a/t/werror.sh b/t/werror.sh
index e24d5179a..e24d5179a 100755..100644
--- a/t/werror.sh
+++ b/t/werror.sh
diff --git a/t/werror2.sh b/t/werror2.sh
index f0fafbfa8..f0fafbfa8 100755..100644
--- a/t/werror2.sh
+++ b/t/werror2.sh
diff --git a/t/werror3.sh b/t/werror3.sh
index d9ceb3639..d9ceb3639 100755..100644
--- a/t/werror3.sh
+++ b/t/werror3.sh
diff --git a/t/werror4.sh b/t/werror4.sh
index d4398fb0c..d4398fb0c 100755..100644
--- a/t/werror4.sh
+++ b/t/werror4.sh
diff --git a/t/whoami.sh b/t/whoami.sh
index 94b9daca9..94b9daca9 100755..100644
--- a/t/whoami.sh
+++ b/t/whoami.sh
diff --git a/t/xsource.sh b/t/xsource.sh
index 70dfd4e74..70dfd4e74 100755..100644
--- a/t/xsource.sh
+++ b/t/xsource.sh
diff --git a/t/yacc-auxdir.sh b/t/yacc-auxdir.sh
index 8ccda6d21..8ccda6d21 100755..100644
--- a/t/yacc-auxdir.sh
+++ b/t/yacc-auxdir.sh
diff --git a/t/yacc-basic.sh b/t/yacc-basic.sh
index de82748ae..de82748ae 100755..100644
--- a/t/yacc-basic.sh
+++ b/t/yacc-basic.sh
diff --git a/t/yacc-bison-skeleton-cxx.sh b/t/yacc-bison-skeleton-cxx.sh
index 2fbc08e9f..2fbc08e9f 100755..100644
--- a/t/yacc-bison-skeleton-cxx.sh
+++ b/t/yacc-bison-skeleton-cxx.sh
diff --git a/t/yacc-bison-skeleton.sh b/t/yacc-bison-skeleton.sh
index f41cdf4bb..f41cdf4bb 100755..100644
--- a/t/yacc-bison-skeleton.sh
+++ b/t/yacc-bison-skeleton.sh
diff --git a/t/yacc-clean-cxx.sh b/t/yacc-clean-cxx.sh
index 3933d1365..3933d1365 100755..100644
--- a/t/yacc-clean-cxx.sh
+++ b/t/yacc-clean-cxx.sh
diff --git a/t/yacc-clean.sh b/t/yacc-clean.sh
index e3081d64f..e3081d64f 100755..100644
--- a/t/yacc-clean.sh
+++ b/t/yacc-clean.sh
diff --git a/t/yacc-cxx-grepping.sh b/t/yacc-cxx-grepping.sh
index 079014673..079014673 100755..100644
--- a/t/yacc-cxx-grepping.sh
+++ b/t/yacc-cxx-grepping.sh
diff --git a/t/yacc-cxx.sh b/t/yacc-cxx.sh
index 1df1cb8b7..1df1cb8b7 100755..100644
--- a/t/yacc-cxx.sh
+++ b/t/yacc-cxx.sh
diff --git a/t/yacc-d-basic.sh b/t/yacc-d-basic.sh
index 73d765314..73d765314 100755..100644
--- a/t/yacc-d-basic.sh
+++ b/t/yacc-d-basic.sh
diff --git a/t/yacc-d-cxx.sh b/t/yacc-d-cxx.sh
index f41205a57..f41205a57 100755..100644
--- a/t/yacc-d-cxx.sh
+++ b/t/yacc-d-cxx.sh
diff --git a/t/yacc-d-vpath.sh b/t/yacc-d-vpath.sh
index 1840e3cc5..1840e3cc5 100755..100644
--- a/t/yacc-d-vpath.sh
+++ b/t/yacc-d-vpath.sh
diff --git a/t/yacc-deleted-headers.sh b/t/yacc-deleted-headers.sh
index 44d855fcc..44d855fcc 100755..100644
--- a/t/yacc-deleted-headers.sh
+++ b/t/yacc-deleted-headers.sh
diff --git a/t/yacc-depend.sh b/t/yacc-depend.sh
index 5df370efe..5df370efe 100755..100644
--- a/t/yacc-depend.sh
+++ b/t/yacc-depend.sh
diff --git a/t/yacc-depend2.sh b/t/yacc-depend2.sh
index e645a35cf..e645a35cf 100755..100644
--- a/t/yacc-depend2.sh
+++ b/t/yacc-depend2.sh
diff --git a/t/yacc-dist-nobuild-subdir.sh b/t/yacc-dist-nobuild-subdir.sh
index 235b4dc21..235b4dc21 100755..100644
--- a/t/yacc-dist-nobuild-subdir.sh
+++ b/t/yacc-dist-nobuild-subdir.sh
diff --git a/t/yacc-dist-nobuild.sh b/t/yacc-dist-nobuild.sh
index 4fd0de347..4fd0de347 100755..100644
--- a/t/yacc-dist-nobuild.sh
+++ b/t/yacc-dist-nobuild.sh
diff --git a/t/yacc-dry.sh b/t/yacc-dry.sh
index 79cf490ae..79cf490ae 100755..100644
--- a/t/yacc-dry.sh
+++ b/t/yacc-dry.sh
diff --git a/t/yacc-grepping.sh b/t/yacc-grepping.sh
index e185e9c94..e185e9c94 100755..100644
--- a/t/yacc-grepping.sh
+++ b/t/yacc-grepping.sh
diff --git a/t/yacc-grepping2.sh b/t/yacc-grepping2.sh
index b00ece765..86d906e10 100755..100644
--- a/t/yacc-grepping2.sh
+++ b/t/yacc-grepping2.sh
@@ -32,7 +32,6 @@ maude_SOURCES = sub/maude.y
 END
 
 $AUTOMAKE -a
-
 # No rule needed, the default .y.c: inference rule is enough
 # (but there may be an additional dependency on a dirstamp file).
 grep '^sub/maude\.c:.*maude\.y' Makefile.in && exit 1
diff --git a/t/yacc-headers-and-dist-pr47.sh b/t/yacc-headers-and-dist-pr47.sh
index 5301706f4..5301706f4 100755..100644
--- a/t/yacc-headers-and-dist-pr47.sh
+++ b/t/yacc-headers-and-dist-pr47.sh
diff --git a/t/yacc-lex-cxx-alone.sh b/t/yacc-lex-cxx-alone.sh
index 0b7f16324..0b7f16324 100755..100644
--- a/t/yacc-lex-cxx-alone.sh
+++ b/t/yacc-lex-cxx-alone.sh
diff --git a/t/yacc-line.sh b/t/yacc-line.sh
index 923fe7b57..923fe7b57 100755..100644
--- a/t/yacc-line.sh
+++ b/t/yacc-line.sh
diff --git a/t/yacc-misc.sh b/t/yacc-misc.sh
index bdadd648e..bdadd648e 100755..100644
--- a/t/yacc-misc.sh
+++ b/t/yacc-misc.sh
diff --git a/t/yacc-mix-c-cxx.sh b/t/yacc-mix-c-cxx.sh
index 70608a55f..70608a55f 100755..100644
--- a/t/yacc-mix-c-cxx.sh
+++ b/t/yacc-mix-c-cxx.sh
diff --git a/t/yacc-nodist.sh b/t/yacc-nodist.sh
index bff99bb16..bff99bb16 100755..100644
--- a/t/yacc-nodist.sh
+++ b/t/yacc-nodist.sh
diff --git a/t/yacc-subdir.sh b/t/yacc-subdir.sh
index 9e5719a34..9e5719a34 100755..100644
--- a/t/yacc-subdir.sh
+++ b/t/yacc-subdir.sh
diff --git a/t/yacc-subobj-nodep.sh b/t/yacc-subobj-nodep.sh
index 0dc15f24b..0dc15f24b 100755..100644
--- a/t/yacc-subobj-nodep.sh
+++ b/t/yacc-subobj-nodep.sh
diff --git a/t/yacc-vpath.sh b/t/yacc-vpath.sh
index bd123374f..bd123374f 100755..100644
--- a/t/yacc-vpath.sh
+++ b/t/yacc-vpath.sh
diff --git a/t/yacc-weirdnames.sh b/t/yacc-weirdnames.sh
index be13c139a..be13c139a 100755..100644
--- a/t/yacc-weirdnames.sh
+++ b/t/yacc-weirdnames.sh
diff --git a/t/yflags-cmdline-override.sh b/t/yflags-cmdline-override.sh
index 3bda47575..b9dae372c 100755..100644
--- a/t/yflags-cmdline-override.sh
+++ b/t/yflags-cmdline-override.sh
@@ -20,7 +20,7 @@
 required='cc yacc'
 . test-init.sh
 
-unset YFLAGS || :
+unset YFLAGS
 
 cat >> configure.ac <<'END'
 AC_PROG_CC
diff --git a/t/yflags-conditional.sh b/t/yflags-conditional.sh
index 66346496e..66346496e 100755..100644
--- a/t/yflags-conditional.sh
+++ b/t/yflags-conditional.sh
diff --git a/t/yflags-d-false-positives.sh b/t/yflags-d-false-positives.sh
index b711c56f4..b711c56f4 100755..100644
--- a/t/yflags-d-false-positives.sh
+++ b/t/yflags-d-false-positives.sh
diff --git a/t/yflags-force-conditional.sh b/t/yflags-force-conditional.sh
index 1d2c8120e..1d2c8120e 100755..100644
--- a/t/yflags-force-conditional.sh
+++ b/t/yflags-force-conditional.sh
diff --git a/t/yflags-force-override.sh b/t/yflags-force-override.sh
index 02ce5ea15..02ce5ea15 100755..100644
--- a/t/yflags-force-override.sh
+++ b/t/yflags-force-override.sh
diff --git a/t/yflags-var-expand.sh b/t/yflags-var-expand.sh
index aaaa10330..aaaa10330 100755..100644
--- a/t/yflags-var-expand.sh
+++ b/t/yflags-var-expand.sh
diff --git a/t/yflags.sh b/t/yflags.sh
index 84c32da70..84c32da70 100755..100644
--- a/t/yflags.sh
+++ b/t/yflags.sh
diff --git a/t/yflags2.sh b/t/yflags2.sh
index b88376585..b88376585 100755..100644
--- a/t/yflags2.sh
+++ b/t/yflags2.sh