automake-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.13.2-24


From: Stefano Lattarini
Subject: [Automake-commit] [SCM] GNU Automake branch, master, updated. v1.13.2-240-g50d986f
Date: Sat, 18 May 2013 22:18:47 +0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=50d986f5d0ccb3b175b91de10f46100d3adce79f

The branch, master has been updated
       via  50d986f5d0ccb3b175b91de10f46100d3adce79f (commit)
       via  42eaadf9b117768814796728c8bef23009d9a52a (commit)
       via  5fe99e28ae324fe1fd211cf289c0f9f75977f07e (commit)
       via  0cca184f65b5397d9e52f32365ab962d5af2f7ea (commit)
       via  0256f1d66ff28cfcef895eb72b15e40e6de442e0 (commit)
       via  84e12c32964ef8454be946b4b2eeb46766ca9add (commit)
       via  176d229b5136806a6f34d18f08dfc986e6c26c76 (commit)
       via  361430c09b240df88092eff7a875b2fc0749670c (commit)
       via  ca41efd3e14a9523e4e0cc1d9689eb30b6b7045a (commit)
       via  c2bdb2a09870aeeed526dd8d8b2a74be6d4b623b (commit)
       via  0985d6733053662d4117f4a740032e4c472b4f6a (commit)
       via  9c468420a8ff18940ab2e9d47d096788ed5801f0 (commit)
       via  6aaa128d3a20fd3e3cc60a695be1f7368203a688 (commit)
       via  74017b56cbadf675de023f7bee6a0b18877c0a74 (commit)
       via  48fc2d83362b4ad62e9e88dfec1cba6b934b8963 (commit)
       via  5969f68eeb8df96670703ef7ad025060fa397e97 (commit)
       via  436cb17eabc2758faec17e2922547a5794a45f57 (commit)
       via  13abbe06ca25c31f011dc3deba21330ca0d7e8ad (commit)
       via  27a6abf4b952e0489dcf87f0770c2b207b733f73 (commit)
       via  1fa0c24dbbfcdec1eccd8bd3242ae9ef20ff1ddb (commit)
       via  9fabb5e4520f583f18cdb80b4b7b55c7f5ba856c (commit)
       via  20d337a7dfacfbd98174105d76528dab3b561bee (commit)
       via  7299c4d24b98b92c8bb9d17d146b46777ab12953 (commit)
       via  5b40c4e744ddd42ab823f0938bb9d96b34aec58e (commit)
       via  020fb48db730a5661fa8fa38229b439d79fd5217 (commit)
      from  c91f24a5a72e0eced917507ff092e7845448b27d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 50d986f5d0ccb3b175b91de10f46100d3adce79f
Author: Stefano Lattarini <address@hidden>
Date:   Sun May 19 00:07:33 2013 +0200

    tests: fix a spurious failure with FreeBSD make
    
    Failures due to known VPATH support issues in that make implementation
    (the same issues that have been causing the long-standing bug#7884).
    
    * t/ltlibsrc.sh: Adjust.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 42eaadf9b117768814796728c8bef23009d9a52a
Merge: 5fe99e2 ca41efd
Author: Stefano Lattarini <address@hidden>
Date:   Sat May 18 20:28:20 2013 +0200

    Merge branch 'subdir-objects-work'
    
    * subdir-objects-work:
      depend: reduce code duplication, de-uglify make verbose output
      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

commit 5fe99e28ae324fe1fd211cf289c0f9f75977f07e
Merge: c2bdb2a 0cca184
Author: Stefano Lattarini <address@hidden>
Date:   Sat May 18 19:27:28 2013 +0200

    Merge branch 'maint'
    
    * maint:
      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

commit ca41efd3e14a9523e4e0cc1d9689eb30b6b7045a
Author: Stefano Lattarini <address@hidden>
Date:   Thu Jan 10 21:52:18 2013 +0100

    depend: reduce code duplication, de-uglify make verbose output
    
    Verbose output from compilation recipes had been made more messy by
    the previous "simplifying" commit v1.13.1d-220-g1fa0c24.  With this
    patch, not only we reduce some code duplication, but also improve
    that output again, for the joy of users who dislike silent-rules :-)
    
    * lib/am/depend2.am: Use the new '%XSOURCE%' transform, instead of
    copying and pasting the idiom for VPATH rewrite emulation over and
    over.  Fix some indentation and line-wrapping issues while at it.
    * bin/automake.in (handle_languages): Implement the new transform.
    * t/silent-nested-vars.sh: Adjust to avoid spurious failures.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit c2bdb2a09870aeeed526dd8d8b2a74be6d4b623b
Author: Stefano Lattarini <address@hidden>
Date:   Thu May 16 13:48:19 2013 +0200

    tests: remove remaining exec bits ('master' branch)
    
    The executable bit gives the impression that the tests are directly
    runnable, as with "./t/foo.sh", but it has been a while since that
    was the case.  Today, tests are runnable only through "make check"
    or "./runtest".
    
    This change is for the 'master' branch (automake 1.99a), and is a
    follow-up to commit 'v1.13.2-3-g74017b5', done on the 'micro' branch
    (automake 1.13.2a) and to commit 'v1.13.2-221-g0985d67', done on the
    'maint' branch (automake 1.13a).
    
    * t/am-prog-mkdir-p.sh: Remove executable bit.
    * t/txinfo-no-split.sh: Likewise.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 0985d6733053662d4117f4a740032e4c472b4f6a
Merge: c91f24a 9c46842
Author: Stefano Lattarini <address@hidden>
Date:   Thu May 16 13:46:17 2013 +0200

    Merge branch 'maint'
    
    * maint:
      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

commit 436cb17eabc2758faec17e2922547a5794a45f57
Author: Stefano Lattarini <address@hidden>
Date:   Thu Jan 10 21:42:28 2013 +0100

    depend: prefer $(...) over `...` in Cygwin-specific recipes
    
    On Cygwin, we can happily assume only POSIX-conforming shells exist.
    This commit is useless by itself, but is useful as a preparatory
    refactoring in view of a future change.
    
    * lib/am/depend2.am: In recipes for producing '.obj' objects, use
    the POSIX form $(...) for command substitution, rather than the
    classic Bourne one `...`.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 13abbe06ca25c31f011dc3deba21330ca0d7e8ad
Author: Stefano Lattarini <address@hidden>
Date:   Thu Jan 10 21:31:57 2013 +0100

    depend: reduce code duplication
    
    Just a simplification; no semantic change is intended.
    
    * lib/am/depend2.am (am__set_depbase): New.  Use it in all the three
    flavours of recipes (.o, .obj, .lo), instead of duplicating its code.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 27a6abf4b952e0489dcf87f0770c2b207b733f73
Author: Stefano Lattarini <address@hidden>
Date:   Thu Jan 10 20:47:57 2013 +0100

    depend: a preparatory refactoring
    
    This is just a preparatory change in view of a future refactoring.
    No semantic change is intended.
    
    * lib/am/depend2.am: Adjust; for example, using '$@' in all recipes
    to indicate the output file (rather than recipe-specific transforms
    like '%OBJ%' and '%LTOBJ%'), and not assuming to know the exact
    file extension of the output file (e.g., whether it's '.o' or '.lo').
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 1fa0c24dbbfcdec1eccd8bd3242ae9ef20ff1ddb
Author: Stefano Lattarini <address@hidden>
Date:   Thu Jan 10 18:04:33 2013 +0100

    depend: refactor and remove code duplication
    
    * lib/am/depend2.am: Here.  The obsolescent comments removed from this
    same file in commit 'v1.13.1-42-g8f06bfb' of 2012-01-09, "depend2.am: fix
    comments on verbosity of compilation rules", gave the rationale for why
    that code duplication was there in the first place (rationale that, like
    those comments, has been obsolete by the silent-rules introduction).
    * bin/automake.in: Given the refactoring in 'depend2.am', there is no
    longer need to add extra trailing whitespace to the entries of the
    '%sourceflags' hash (which are used for the '%SOURCEFLAG%' transform
    when 'depend2.am' is processed.
    * t/fort2.sh: Adjust to avoid spurious failures.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 9fabb5e4520f583f18cdb80b4b7b55c7f5ba856c
Author: Stefano Lattarini <address@hidden>
Date:   Thu Jan 10 19:54:13 2013 +0100

    Automake::Language: drop unused fields 'compile_flag' and 'output_flag'
    
    They are unused after the recent flurry of changes.  This is just a
    simplification; no semantic change is intended.
    
    * lib/Automake/Language.pm (Class::Struct): Remove unused fields here.
    * bin/automake.in: And here, in all the 'register_language()' invocations.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 20d337a7dfacfbd98174105d76528dab3b561bee
Author: Stefano Lattarini <address@hidden>
Date:   Thu Jan 10 19:48:14 2013 +0100

    depend: assume '-c' compiler flag always means to produce object files
    
    Rather than fully-fledged executables.  This is the case for all the
    compilers of all languages supported by Automake.
    
    This is just a simplification; no semantic changes are intended.
    
    * bin/automake.in (handle_languages): Drop transform '%-c%'.
    * lib/am/depend2.am: Adjust to just assume the '%-c%' transform
    expands to "-c".
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 7299c4d24b98b92c8bb9d17d146b46777ab12953
Author: Stefano Lattarini <address@hidden>
Date:   Thu Jan 10 19:38:58 2013 +0100

    depend: assume we can always pass '-o' to the C compiler
    
    This is the case after the change in commit v1.13.1-56-g34001a9 of
    2013-01-09 (compile: use 'compile' script when "-c -o" is used with
    losing compilers).
    
    This is just a simplification; no semantic changes are intended.
    
    * bin/automake.in (handle_languages): Drop transform '%-o%', and
    definitions of '$output_flag'.
    * lib/am/depend2.am: Adjust to just assume the '?-o?' transform is
    true, and the '%-o%' transform expands to "-o".
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 5b40c4e744ddd42ab823f0938bb9d96b34aec58e
Author: Stefano Lattarini <address@hidden>
Date:   Tue Jan 8 14:04:00 2013 +0100

    cleanup: having subdir-objects mandatory allow us some simplifications
    
    Few minor cleanups made possible by earlier changes, plus other minor
    cleanups triggered in cascade.  No semantic change is intended.
    
    This is a follow-up on previous commit 'v1.13.1d-214-g3ad07d2', and
    an adjusted backport of Automake-NG commit 'v1.12.1-315-gc97d41b'
    of 2012-06-08 ([ng] cleanup: after enabling of subdir-objects
    unconditionally).
    
    * bin/automake.in (LANG_IGNORE, LANG_SUBDIR): Remove.
    (handle_languages): Drop the '%DEPBASE%' transform when processing
    the '$rule_file'.
    (register_language ('name' => 'vala', ...)): Add '.vapi' to the entry
    'extensions', and simplify the entry 'output_extensions' to point to
    a dummy subroutine (since it wasn't really used anyway).
    (handle_single_transform): No longer expect the 'lang_*_rewrite'
    subroutines to return a 'LANG_*' constant, but only a transformed
    extension, if required.  To decide whether further processing of the
    source file should be stopped, rely on a new set of 'lang_*_ignore'
    subroutines, defaulting to a subroutine that returns false.
    Accordingly, don't special case the handling of '.vapi' files anymore,
    instead rely on ...
    (lang_vala_ignore, lang_header_ignore): ... these new subroutines to
    avoid extra processing of C/C++ headers and Vala '.vapi' headers.
    (lang_java_rewrite): Remove.
    Remove an outdated comment.
    * lib/am/depend2.am: Partial rewrite to reduce code duplication and
    drop use of the '%DEPBASE%' transform.
    * t/compile_f_c_cxx.sh: Adjust.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 020fb48db730a5661fa8fa38229b439d79fd5217
Author: Stefano Lattarini <address@hidden>
Date:   Wed Jun 6 10:27:46 2012 +0200

    subdir-objects: enable unconditionally
    
    See automake bug#13378.
    
    The fact that Automake-generated Makefiles places compiled object files
    in the current directory by default, also when the corresponding source
    file is in a subdirectory, is basically an historical accident, due to
    the fact that the 'subdir-objects' option had only been introduced in
    April 1999, starting with commit 'user-dep-gen-branchpoint-56-g88b5959',
    and never made the default, likely to avoid backwards-compatibility
    issues.
    
    Since we believe the behaviour enabled by the 'subdir-objects' is the
    only natural and most useful one, we make it the only only one available,
    simplifying the Automake implementation and APIs a little in the process.
    
    This change is basically an adjusted backport of Automake-NG commit
    'v1.12.1-313-g14fe163' of 2012-06-07, "[ng] subdir-objects: enable
    unconditionally".
    
    * NEWS: Update.
    * doc/automake.texi (Program and Library Variables): The output
    object files are no longer placed in the current directory by
    default, but rather in the same directory of the source file.
    (LIBOBJS): Now the $(LIBOBJS) and $(ALLOCA) variables can also
    be used outside of the directory where their sources lie.
    (List of Automake options): Report the 'subdir-objects' option
    as a no-op, existing only for compatibility with older versions
    of Automake.
    Other related minor adjustments.
    * bin/automake.in (LANG_PROCESS): Remove, it's no longer needed.
    (handle_languages): Don't test whether option 'subdir-objects'
    is set (just assume it is), and do not use the '%SUBDIROBJ%'
    transform when processing '.am' fragments.
    (lang_sub_obj): Delete, it would just return 'LANG_SUBDIR'
    unconditionally now.
    (lang_lex_rewrite): Adjust.  Don't test whether the option
    'subdir-objects' is set (just assume it is).
    (lang_yacc_rewrite): Likewise.
    (handle_single_transform): Likewise.  Remove an obsolete
    comment.  Add a proper "FIXME" comments about a fragment
    of code that might have become dead code now.
    (handle_LIBOBJS_or_ALLOCA): Simplify assuming that the option
    'subdir-objects' is always set.  Accordingly, there's no need
    to warn anymore if '$(LIBOBJS)' or '$(ALLOCA)' are used outside
    the '$config_libobj_dir' directory (as specified by autoconf
    macro 'AC_CONFIG_LIBOBJ_DIR').
    * lib/am/depend2.am: Assume the '?SUBDIROBJ?' Automake time
    conditional is always true, and remove its uses accordingly.
    * t/compile_f_c_cxx.sh: Adjust.
    * t/cscope.tap: Likewise.
    * t/depcomp8a.sh: Likewise.
    * t/depcomp8b.sh: Likewise.
    * t/libtool3.sh: Likewise.
    * t/ltlibsrc.sh: Likewise.
    * t/pr401.sh: Likewise.
    * t/pr401b.sh: Likewise.
    * t/pr401c.sh: Likewise.
    * t/subobj.sh: Likewise.
    * t/lex-line.sh: Likewise.
    * t/yacc-line.sh: Likewise.
    * t/yacc5.sh: Likewise.
    * t/vala-libs.sh: Likewise.
    * t/fort4.sh: Likewise, and extend a bit.
    * t/fort5.sh: Likewise.
    * t/gcj.sh: Likewise.
    * t/subpkg.sh: Likewise.
    * t/subpkg-yacc.sh: Likewise.
    * t/xsource.sh: Likewise.
    * t/libobj20a.sh: Remove as obsolete.
    * t/libobj20b.sh: Adjust heading comments.
    * t/libobj20c.sh: Likewise.
    * t/subobj4.sh: Remove as obsolete.
    * t/sourcefile-in-subdir.sh: Likewise.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 HACKING                                            |    2 -
 NEWS                                               |   19 ++
 PLANS/subdir-objects.txt                           |   18 +-
 bin/automake.in                                    |  263 +++++---------------
 doc/automake.texi                                  |   30 +--
 gen-testsuite-part                                 |    4 +-
 lib/Automake/Language.pm                           |    4 -
 lib/am/depend2.am                                  |   70 ++----
 lib/am/lisp.am                                     |    4 +-
 maintainer/syntax-checks.mk                        |   14 -
 t/Makefile.inc                                     |   14 +-
 t/README                                           |    6 +-
 t/aclocal-macrodir.tap                             |    2 +-
 t/aclocal-macrodirs.tap                            |    2 +-
 t/auxdir-autodetect.sh                             |    2 +-
 t/ax/am-test-lib.sh                                |   10 +-
 t/ax/deltree.pl                                    |   19 ++
 t/ax/test-defs.in                                  |    8 +-
 t/ax/test-lib.sh                                   |   24 ++-
 t/check-tests-in-builddir.sh                       |    2 +-
 t/compile_f_c_cxx.sh                               |   15 +-
 t/cscope.tap                                       |    6 +-
 t/depcomp8a.sh                                     |   19 +--
 t/depcomp8b.sh                                     |   27 +--
 t/dist-formats.tap                                 |    2 +-
 t/distcheck-configure-flags-am.sh                  |    2 +-
 t/distcheck-configure-flags.sh                     |    2 +-
 t/fort2.sh                                         |   13 +-
 t/fort4.sh                                         |   39 ++--
 t/fort5.sh                                         |   15 +-
 t/gcj.sh                                           |   37 +++-
 t/java-empty-classpath.sh                          |    4 +-
 t/javaflags.sh                                     |    2 +-
 t/lex-line.sh                                      |   32 +--
 t/lflags.sh                                        |    2 +-
 t/lflags2.sh                                       |    2 +-
 t/libobj20a.sh                                     |   45 ----
 t/libobj20b.sh                                     |    2 +-
 t/libobj20c.sh                                     |    2 +-
 t/libtool3.sh                                      |   14 +-
 t/lisp-flags.sh                                    |    2 +-
 t/lisp6.sh                                         |    2 +-
 t/list-of-tests.mk                                 |    3 -
 t/ltlibsrc.sh                                      |    9 +-
 t/missing-auxfile-stops-makefiles-creation.sh      |    2 +-
 t/parallel-am.sh                                   |    2 +-
 t/parallel-am2.sh                                  |    2 +-
 t/parallel-am3.sh                                  |    2 +-
 t/parallel-tests-log-override-recheck.sh           |    2 +-
 t/pkg-config-macros.sh                             |    2 +-
 t/pr401.sh                                         |   11 -
 t/pr401b.sh                                        |    9 -
 t/pr401c.sh                                        |   10 -
 t/python-missing.sh                                |    2 +-
 t/python-too-old.sh                                |    2 +-
 t/python11.sh                                      |    2 +-
 t/remake-deeply-nested.sh                          |    2 +-
 t/self-check-dir.tap                               |    2 +-
 t/self-check-report.sh                             |    2 +-
 t/self-check-seq.tap                               |    2 +-
 t/silent-configsite.sh                             |    2 +-
 t/silent-nested-vars.sh                            |    2 +-
 t/sourcefile-in-subdir.sh                          |   36 ---
 t/subobj.sh                                        |   32 +---
 t/subobj4.sh                                       |   50 ----
 t/subpkg-yacc.sh                                   |   14 +-
 t/subpkg.sh                                        |    7 +-
 t/suffix6c.sh                                      |    2 +-
 t/tar-override.sh                                  |    2 +-
 t/tests-environment-and-log-compiler.sh            |    2 +-
 t/vala-configure.sh                                |    2 +-
 t/werror3.sh                                       |    2 +-
 t/xsource.sh                                       |   18 +-
 t/yacc-grepping2.sh                                |   30 +--
 t/yacc-line.sh                                     |   45 +---
 t/yflags-cmdline-override.sh                       |    2 +-
 t/yflags.sh                                        |    2 +-
 t/yflags2.sh                                       |    2 +-
 78 files changed, 366 insertions(+), 757 deletions(-)
 mode change 100755 => 100644 t/ac-output-old.tap
 mode change 100755 => 100644 t/aclocal-I-and-install.sh
 mode change 100755 => 100644 t/aclocal-I-order-1.sh
 mode change 100755 => 100644 t/aclocal-I-order-2.sh
 mode change 100755 => 100644 t/aclocal-I-order-3.sh
 mode change 100755 => 100644 t/aclocal-acdir.sh
 mode change 100755 => 100644 t/aclocal-amflags.sh
 mode change 100755 => 100644 t/aclocal-autoconf-version-check.sh
 mode change 100755 => 100644 t/aclocal-comments-respected.sh
 mode change 100755 => 100644 t/aclocal-deleted-header-aclocal-amflags.sh
 mode change 100755 => 100644 t/aclocal-deleted-header.sh
 mode change 100755 => 100644 t/aclocal-deps-subdir.sh
 mode change 100755 => 100644 t/aclocal-deps.sh
 mode change 100755 => 100644 t/aclocal-dirlist-abspath.sh
 mode change 100755 => 100644 t/aclocal-dirlist-globbing.sh
 mode change 100755 => 100644 t/aclocal-dirlist.sh
 mode change 100755 => 100644 t/aclocal-install-absdir.sh
 mode change 100755 => 100644 t/aclocal-install-fail.sh
 mode change 100755 => 100644 t/aclocal-install-mkdir.sh
 mode change 100755 => 100644 
t/aclocal-m4-include-are-scanned-aclocal-amflags.sh
 mode change 100755 => 100644 t/aclocal-m4-include-are-scanned.sh
 mode change 100755 => 100644 t/aclocal-m4-sinclude.sh
 mode change 100755 => 100644 t/aclocal-macrodir.tap
 mode change 100755 => 100644 t/aclocal-macrodirs.tap
 mode change 100755 => 100644 t/aclocal-missing-macros.sh
 mode change 100755 => 100644 t/aclocal-no-extra-scan.sh
 mode change 100755 => 100644 t/aclocal-no-force.sh
 mode change 100755 => 100644 t/aclocal-no-install-no-mkdir.sh
 mode change 100755 => 100644 t/aclocal-no-symlinked-overwrite.sh
 mode change 100755 => 100644 t/aclocal-no-unused-required.sh
 mode change 100755 => 100644 t/aclocal-path-install-serial.sh
 mode change 100755 => 100644 t/aclocal-path-install.sh
 mode change 100755 => 100644 t/aclocal-path-nonexistent.sh
 mode change 100755 => 100644 t/aclocal-path-precedence.sh
 mode change 100755 => 100644 t/aclocal-path.sh
 mode change 100755 => 100644 t/aclocal-pr450.sh
 mode change 100755 => 100644 t/aclocal-print-acdir.sh
 mode change 100755 => 100644 t/aclocal-remake-misc.sh
 mode change 100755 => 100644 t/aclocal-req.sh
 mode change 100755 => 100644 t/aclocal-scan-configure-ac-pr319.sh
 mode change 100755 => 100644 t/aclocal-serial.sh
 mode change 100755 => 100644 t/aclocal-underquoted-defun.sh
 mode change 100755 => 100644 t/aclocal-verbose-install.sh
 mode change 100755 => 100644 t/aclocal.sh
 mode change 100755 => 100644 t/acsilent.sh
 mode change 100755 => 100644 t/acsubst.sh
 mode change 100755 => 100644 t/acsubst2.sh
 mode change 100755 => 100644 t/add-missing-multiple.sh
 mode change 100755 => 100644 t/add-missing.tap
 mode change 100755 => 100644 t/all.sh
 mode change 100755 => 100644 t/all2.sh
 mode change 100755 => 100644 t/alloca.sh
 mode change 100755 => 100644 t/alloca2.sh
 mode change 100755 => 100644 t/alpha.sh
 mode change 100755 => 100644 t/alpha2.sh
 mode change 100755 => 100644 t/am-config-header.sh
 mode change 100755 => 100644 t/am-default-source-ext.sh
 mode change 100755 => 100644 t/am-macro-not-found.sh
 mode change 100755 => 100644 t/am-missing-prog.sh
 mode change 100755 => 100644 t/am-prog-cc-c-o.sh
 mode change 100755 => 100644 t/am-prog-cc-stdc.sh
 mode change 100755 => 100644 t/am-prog-mkdir-p.sh
 mode change 100755 => 100644 t/am-tests-environment.sh
 mode change 100755 => 100644 t/amassign.sh
 mode change 100755 => 100644 t/amhello-binpkg.sh
 mode change 100755 => 100644 t/amhello-cflags.sh
 mode change 100755 => 100644 t/amhello-cross-compile.sh
 mode change 100755 => 100644 t/aminit-moreargs-deprecation.sh
 mode change 100755 => 100644 t/amopt.sh
 mode change 100755 => 100644 t/amopts-location.sh
 mode change 100755 => 100644 t/amopts-variable-expansion.sh
 mode change 100755 => 100644 t/amsubst.sh
 mode change 100755 => 100644 t/ansi2knr-no-more.sh
 mode change 100755 => 100644 t/ar-lib.sh
 mode change 100755 => 100644 t/ar-lib2.sh
 mode change 100755 => 100644 t/ar-lib3.sh
 mode change 100755 => 100644 t/ar-lib4.sh
 mode change 100755 => 100644 t/ar-lib5a.sh
 mode change 100755 => 100644 t/ar-lib5b.sh
 mode change 100755 => 100644 t/ar-lib6a.sh
 mode change 100755 => 100644 t/ar-lib6b.sh
 mode change 100755 => 100644 t/ar-lib7.sh
 mode change 100755 => 100644 t/ar.sh
 mode change 100755 => 100644 t/ar2.sh
 mode change 100755 => 100644 t/ar3.sh
 mode change 100755 => 100644 t/ar4.sh
 mode change 100755 => 100644 t/ar5.sh
 mode change 100755 => 100644 t/asm.sh
 mode change 100755 => 100644 t/asm2.sh
 mode change 100755 => 100644 t/asm3.sh
 mode change 100755 => 100644 t/autodist-acconfig-no-subdir.sh
 mode change 100755 => 100644 t/autodist-acconfig.sh
 mode change 100755 => 100644 t/autodist-aclocal-m4.sh
 mode change 100755 => 100644 t/autodist-config-headers.sh
 mode change 100755 => 100644 t/autodist-configure-no-subdir.sh
 mode change 100755 => 100644 t/autodist-no-duplicate.sh
 mode change 100755 => 100644 t/autodist-stamp-vti.sh
 mode change 100755 => 100644 t/autodist-subdir.sh
 mode change 100755 => 100644 t/autodist.sh
 mode change 100755 => 100644 t/autohdr-subdir-pr12495.sh
 mode change 100755 => 100644 t/autohdr.sh
 mode change 100755 => 100644 t/autohdr3.sh
 mode change 100755 => 100644 t/autohdr4.sh
 mode change 100755 => 100644 t/autohdrdry.sh
 mode change 100755 => 100644 t/automake-cmdline.tap
 mode change 100755 => 100644 t/auxdir-autodetect.sh
 mode change 100755 => 100644 t/auxdir-computed.tap
 mode change 100755 => 100644 t/auxdir-misplaced.sh
 mode change 100755 => 100644 t/auxdir-nonexistent.sh
 mode change 100755 => 100644 t/auxdir-unportable.tap
 mode change 100755 => 100644 t/auxdir.sh
 mode change 100755 => 100644 t/auxdir6.sh
 mode change 100755 => 100644 t/auxdir7.sh
 mode change 100755 => 100644 t/auxdir8.sh
 create mode 100644 t/ax/deltree.pl
 mode change 100755 => 100644 t/backcompat-acout.sh
 mode change 100755 => 100644 t/backcompat.sh
 mode change 100755 => 100644 t/backcompat2.sh
 mode change 100755 => 100644 t/backcompat3.sh
 mode change 100755 => 100644 t/backcompat6.sh
 mode change 100755 => 100644 t/backslash-before-trailing-whitespace.sh
 mode change 100755 => 100644 t/backslash-issues.sh
 mode change 100755 => 100644 t/badline.sh
 mode change 100755 => 100644 t/badopt.sh
 mode change 100755 => 100644 t/badprog.sh
 mode change 100755 => 100644 t/built-sources-check.sh
 mode change 100755 => 100644 t/built-sources-cond.sh
 mode change 100755 => 100644 t/built-sources-fork-bomb.sh
 mode change 100755 => 100644 t/built-sources-install.sh
 mode change 100755 => 100644 t/built-sources-subdir.sh
 mode change 100755 => 100644 t/built-sources.sh
 mode change 100755 => 100644 t/c-demo.sh
 mode change 100755 => 100644 t/candist.sh
 mode change 100755 => 100644 t/canon-name.sh
 mode change 100755 => 100644 t/canon.sh
 mode change 100755 => 100644 t/canon2.sh
 mode change 100755 => 100644 t/canon3.sh
 mode change 100755 => 100644 t/canon4.sh
 mode change 100755 => 100644 t/canon5.sh
 mode change 100755 => 100644 t/canon6.sh
 mode change 100755 => 100644 t/canon7.sh
 mode change 100755 => 100644 t/canon8.sh
 mode change 100755 => 100644 t/ccnoco.sh
 mode change 100755 => 100644 t/ccnoco3.sh
 mode change 100755 => 100644 t/ccnoco4.sh
 mode change 100755 => 100644 t/check-concurrency-bug9245.sh
 mode change 100755 => 100644 t/check-exported-srcdir.sh
 mode change 100755 => 100644 t/check-fd-redirect.sh
 mode change 100755 => 100644 t/check-no-test-driver.sh
 mode change 100755 => 100644 t/check-subst-prog.sh
 mode change 100755 => 100644 t/check-subst.sh
 mode change 100755 => 100644 t/check-tests-in-builddir.sh
 mode change 100755 => 100644 t/check.sh
 mode change 100755 => 100644 t/check10.sh
 mode change 100755 => 100644 t/check11.sh
 mode change 100755 => 100644 t/check12.sh
 mode change 100755 => 100644 t/check2.sh
 mode change 100755 => 100644 t/check4.sh
 mode change 100755 => 100644 t/check5.sh
 mode change 100755 => 100644 t/check6.sh
 mode change 100755 => 100644 t/check7.sh
 mode change 100755 => 100644 t/check8.sh
 mode change 100755 => 100644 t/checkall.sh
 mode change 100755 => 100644 t/clean.sh
 mode change 100755 => 100644 t/colneq.sh
 mode change 100755 => 100644 t/colneq2.sh
 mode change 100755 => 100644 t/colneq3.sh
 mode change 100755 => 100644 t/colon.sh
 mode change 100755 => 100644 t/colon2.sh
 mode change 100755 => 100644 t/colon3.sh
 mode change 100755 => 100644 t/colon4.sh
 mode change 100755 => 100644 t/colon5.sh
 mode change 100755 => 100644 t/colon6.sh
 mode change 100755 => 100644 t/colon7.sh
 mode change 100755 => 100644 t/color-tests-opt.sh
 mode change 100755 => 100644 t/color-tests.sh
 mode change 100755 => 100644 t/color-tests2.sh
 mode change 100755 => 100644 t/commen10.sh
 mode change 100755 => 100644 t/commen11.sh
 mode change 100755 => 100644 t/comment-block.sh
 mode change 100755 => 100644 t/comment.sh
 mode change 100755 => 100644 t/comment2.sh
 mode change 100755 => 100644 t/comment3.sh
 mode change 100755 => 100644 t/comment4.sh
 mode change 100755 => 100644 t/comment5.sh
 mode change 100755 => 100644 t/comment6.sh
 mode change 100755 => 100644 t/comment7.sh
 mode change 100755 => 100644 t/comment8.sh
 mode change 100755 => 100644 t/comment9.sh
 mode change 100755 => 100644 t/comments-in-var-def.sh
 mode change 100755 => 100644 t/compile.sh
 mode change 100755 => 100644 t/compile2.sh
 mode change 100755 => 100644 t/compile3.sh
 mode change 100755 => 100644 t/compile4.sh
 mode change 100755 => 100644 t/compile5.sh
 mode change 100755 => 100644 t/compile6.sh
 mode change 100755 => 100644 t/compile_f90_c_cxx.sh
 mode change 100755 => 100644 t/compile_f_c_cxx.sh
 mode change 100755 => 100644 t/cond-basic.sh
 mode change 100755 => 100644 t/cond.sh
 mode change 100755 => 100644 t/cond10.sh
 mode change 100755 => 100644 t/cond11.sh
 mode change 100755 => 100644 t/cond13.sh
 mode change 100755 => 100644 t/cond14.sh
 mode change 100755 => 100644 t/cond15.sh
 mode change 100755 => 100644 t/cond16.sh
 mode change 100755 => 100644 t/cond17.sh
 mode change 100755 => 100644 t/cond18.sh
 mode change 100755 => 100644 t/cond19.sh
 mode change 100755 => 100644 t/cond20.sh
 mode change 100755 => 100644 t/cond21.sh
 mode change 100755 => 100644 t/cond22.sh
 mode change 100755 => 100644 t/cond23.sh
 mode change 100755 => 100644 t/cond24.sh
 mode change 100755 => 100644 t/cond25.sh
 mode change 100755 => 100644 t/cond26.sh
 mode change 100755 => 100644 t/cond27.sh
 mode change 100755 => 100644 t/cond28.sh
 mode change 100755 => 100644 t/cond3.sh
 mode change 100755 => 100644 t/cond30.sh
 mode change 100755 => 100644 t/cond31.sh
 mode change 100755 => 100644 t/cond32.sh
 mode change 100755 => 100644 t/cond33.sh
 mode change 100755 => 100644 t/cond34.sh
 mode change 100755 => 100644 t/cond35.sh
 mode change 100755 => 100644 t/cond36.sh
 mode change 100755 => 100644 t/cond37.sh
 mode change 100755 => 100644 t/cond38.sh
 mode change 100755 => 100644 t/cond39.sh
 mode change 100755 => 100644 t/cond4.sh
 mode change 100755 => 100644 t/cond40.sh
 mode change 100755 => 100644 t/cond41.sh
 mode change 100755 => 100644 t/cond42.sh
 mode change 100755 => 100644 t/cond43.sh
 mode change 100755 => 100644 t/cond44.sh
 mode change 100755 => 100644 t/cond45.sh
 mode change 100755 => 100644 t/cond46.sh
 mode change 100755 => 100644 t/cond5.sh
 mode change 100755 => 100644 t/cond6.sh
 mode change 100755 => 100644 t/cond7.sh
 mode change 100755 => 100644 t/cond8.sh
 mode change 100755 => 100644 t/cond9.sh
 mode change 100755 => 100644 t/condd.sh
 mode change 100755 => 100644 t/condhook.sh
 mode change 100755 => 100644 t/condhook2.sh
 mode change 100755 => 100644 t/condinc.sh
 mode change 100755 => 100644 t/condinc2.sh
 mode change 100755 => 100644 t/condlib.sh
 mode change 100755 => 100644 t/condman2.sh
 mode change 100755 => 100644 t/condman3.sh
 mode change 100755 => 100644 t/confdeps.sh
 mode change 100755 => 100644 t/conff.sh
 mode change 100755 => 100644 t/conff2.sh
 mode change 100755 => 100644 t/conffile-leading-dot.sh
 mode change 100755 => 100644 t/confh-subdir-clean.sh
 mode change 100755 => 100644 t/confh.sh
 mode change 100755 => 100644 t/confh4.sh
 mode change 100755 => 100644 t/confh5.sh
 mode change 100755 => 100644 t/confh6.sh
 mode change 100755 => 100644 t/confh7.sh
 mode change 100755 => 100644 t/confh8.sh
 mode change 100755 => 100644 t/confincl.sh
 mode change 100755 => 100644 t/conflnk.sh
 mode change 100755 => 100644 t/conflnk2.sh
 mode change 100755 => 100644 t/conflnk3.sh
 mode change 100755 => 100644 t/conflnk4.sh
 mode change 100755 => 100644 t/confsub.sh
 mode change 100755 => 100644 t/confvar.sh
 mode change 100755 => 100644 t/confvar2.sh
 mode change 100755 => 100644 t/copy.sh
 mode change 100755 => 100644 t/cscope.tap
 mode change 100755 => 100644 t/cscope2.sh
 mode change 100755 => 100644 t/cscope3.sh
 mode change 100755 => 100644 t/cxx-demo.sh
 mode change 100755 => 100644 t/cxx-lt-demo.sh
 mode change 100755 => 100644 t/cxx.sh
 mode change 100755 => 100644 t/cxx2.sh
 mode change 100755 => 100644 t/cxxcpp.sh
 mode change 100755 => 100644 t/cxxlibobj.sh
 mode change 100755 => 100644 t/cxxlink.sh
 mode change 100755 => 100644 t/cxxnoc.sh
 mode change 100755 => 100644 t/cygnus-no-more.sh
 mode change 100755 => 100644 t/cygwin32.sh
 mode change 100755 => 100644 t/dash.sh
 mode change 100755 => 100644 t/defun.sh
 mode change 100755 => 100644 t/defun2.sh
 mode change 100755 => 100644 t/dejagnu-absolute-builddir.sh
 mode change 100755 => 100644 t/dejagnu-relative-srcdir.sh
 mode change 100755 => 100644 t/dejagnu-siteexp-append.sh
 mode change 100755 => 100644 t/dejagnu-siteexp-extend.sh
 mode change 100755 => 100644 t/dejagnu-siteexp-useredit.sh
 mode change 100755 => 100644 t/dejagnu.sh
 mode change 100755 => 100644 t/dejagnu2.sh
 mode change 100755 => 100644 t/dejagnu3.sh
 mode change 100755 => 100644 t/dejagnu4.sh
 mode change 100755 => 100644 t/dejagnu5.sh
 mode change 100755 => 100644 t/dejagnu6.sh
 mode change 100755 => 100644 t/dejagnu7.sh
 mode change 100755 => 100644 t/deleted-am.sh
 mode change 100755 => 100644 t/deleted-m4.sh
 mode change 100755 => 100644 t/depacl2.sh
 mode change 100755 => 100644 t/depcomp-implicit-auxdir.sh
 mode change 100755 => 100644 t/depcomp.sh
 mode change 100755 => 100644 t/depcomp2.sh
 mode change 100755 => 100644 t/depcomp8a.sh
 mode change 100755 => 100644 t/depcomp8b.sh
 mode change 100755 => 100644 t/depdist.sh
 mode change 100755 => 100644 t/depend.sh
 mode change 100755 => 100644 t/depend3.sh
 mode change 100755 => 100644 t/depend4.sh
 mode change 100755 => 100644 t/depend5.sh
 mode change 100755 => 100644 t/depend6.sh
 mode change 100755 => 100644 t/deprecated-acinit.sh
 mode change 100755 => 100644 t/destdir.sh
 mode change 100755 => 100644 t/dir-named-obj-is-bad.sh
 mode change 100755 => 100644 t/discover.sh
 mode change 100755 => 100644 t/dist-auxdir-many-subdirs.sh
 mode change 100755 => 100644 t/dist-auxfile-2.sh
 mode change 100755 => 100644 t/dist-auxfile.sh
 mode change 100755 => 100644 t/dist-formats.tap
 mode change 100755 => 100644 t/dist-included-parent-dir.sh
 mode change 100755 => 100644 t/dist-lzma.sh
 mode change 100755 => 100644 t/dist-missing-am.sh
 mode change 100755 => 100644 t/dist-missing-included-m4.sh
 mode change 100755 => 100644 t/dist-missing-m4.sh
 mode change 100755 => 100644 t/dist-pr109765.sh
 mode change 100755 => 100644 t/dist-readonly.sh
 mode change 100755 => 100644 t/dist-repeated.sh
 mode change 100755 => 100644 t/dist-shar.sh
 mode change 100755 => 100644 t/dist-tarZ.sh
 mode change 100755 => 100644 t/distcheck-configure-flags-am.sh
 mode change 100755 => 100644 t/distcheck-configure-flags-subpkg.sh
 mode change 100755 => 100644 t/distcheck-configure-flags.sh
 mode change 100755 => 100644 t/distcheck-hook.sh
 mode change 100755 => 100644 t/distcheck-hook2.sh
 mode change 100755 => 100644 t/distcheck-missing-m4.sh
 mode change 100755 => 100644 t/distcheck-outdated-m4.sh
 mode change 100755 => 100644 t/distcheck-override-infodir.sh
 mode change 100755 => 100644 t/distcheck-pr10470.sh
 mode change 100755 => 100644 t/distcheck-pr9579.sh
 mode change 100755 => 100644 t/distcheck-writable-srcdir.sh
 mode change 100755 => 100644 t/distcleancheck.sh
 mode change 100755 => 100644 t/distcom-subdir.sh
 mode change 100755 => 100644 t/distcom2.sh
 mode change 100755 => 100644 t/distcom3.sh
 mode change 100755 => 100644 t/distcom4.sh
 mode change 100755 => 100644 t/distcom5.sh
 mode change 100755 => 100644 t/distdir.sh
 mode change 100755 => 100644 t/disthook.sh
 mode change 100755 => 100644 t/distlinks.sh
 mode change 100755 => 100644 t/distlinksbrk.sh
 mode change 100755 => 100644 t/distname.sh
 mode change 100755 => 100644 t/dmalloc.sh
 mode change 100755 => 100644 t/doc-parsing-buglets-colneq-subst.sh
 mode change 100755 => 100644 t/doc-parsing-buglets-tabs.sh
 mode change 100755 => 100644 t/dollar.sh
 mode change 100755 => 100644 t/dollarvar.sh
 mode change 100755 => 100644 t/dollarvar2.sh
 mode change 100755 => 100644 t/double.sh
 mode change 100755 => 100644 t/dup2.sh
 mode change 100755 => 100644 t/else.sh
 mode change 100755 => 100644 t/empty-data-primary.sh
 mode change 100755 => 100644 t/empty-sources-primary.tap
 mode change 100755 => 100644 t/exdir.sh
 mode change 100755 => 100644 t/exdir2.sh
 mode change 100755 => 100644 t/exdir3.sh
 mode change 100755 => 100644 t/exeext.sh
 mode change 100755 => 100644 t/exeext2.sh
 mode change 100755 => 100644 t/exeext3.sh
 mode change 100755 => 100644 t/exeext4.sh
 mode change 100755 => 100644 t/exsource.sh
 mode change 100755 => 100644 t/ext.sh
 mode change 100755 => 100644 t/ext2.sh
 mode change 100755 => 100644 t/ext3.sh
 mode change 100755 => 100644 t/extra-data.sh
 mode change 100755 => 100644 t/extra-deps-lt.sh
 mode change 100755 => 100644 t/extra-deps.sh
 mode change 100755 => 100644 t/extra-dist-dirs-and-subdirs.sh
 mode change 100755 => 100644 t/extra-dist-vpath-dir-merge.sh
 mode change 100755 => 100644 t/extra-dist-vpath-dir.sh
 mode change 100755 => 100644 t/extra-dist-wildcards-gnu.sh
 mode change 100755 => 100644 t/extra-dist-wildcards-vpath.sh
 mode change 100755 => 100644 t/extra-dist-wildcards.sh
 mode change 100755 => 100644 t/extra-portability.sh
 mode change 100755 => 100644 t/extra-portability2.sh
 mode change 100755 => 100644 t/extra-portability3.sh
 mode change 100755 => 100644 t/extra-programs-and-libs.sh
 mode change 100755 => 100644 t/extra-programs-empty.sh
 mode change 100755 => 100644 t/extra-programs-misc.sh
 mode change 100755 => 100644 t/extra.sh
 mode change 100755 => 100644 t/extra2.sh
 mode change 100755 => 100644 t/f90only.sh
 mode change 100755 => 100644 t/flavor.sh
 mode change 100755 => 100644 t/flibs.sh
 mode change 100755 => 100644 t/fn99.sh
 mode change 100755 => 100644 t/fn99subdir.sh
 mode change 100755 => 100644 t/fnoc.sh
 mode change 100755 => 100644 t/fonly.sh
 mode change 100755 => 100644 t/forcemiss.sh
 mode change 100755 => 100644 t/forcemiss2.sh
 mode change 100755 => 100644 t/fort1.sh
 mode change 100755 => 100644 t/fort2.sh
 mode change 100755 => 100644 t/fort4.sh
 mode change 100755 => 100644 t/fort5.sh
 mode change 100755 => 100644 t/fortdep.sh
 mode change 100755 => 100644 t/gcj.sh
 mode change 100755 => 100644 t/gcj2.sh
 mode change 100755 => 100644 t/gcj3.sh
 mode change 100755 => 100644 t/gcj4.sh
 mode change 100755 => 100644 t/gcj5.sh
 mode change 100755 => 100644 t/gcj6.sh
 mode change 100755 => 100644 t/get-sysconf.sh
 mode change 100755 => 100644 t/gettext-macros.sh
 mode change 100755 => 100644 t/gettext.sh
 mode change 100755 => 100644 t/gettext2.sh
 mode change 100755 => 100644 t/gettext3.sh
 mode change 100755 => 100644 t/gnits.sh
 mode change 100755 => 100644 t/gnits2.sh
 mode change 100755 => 100644 t/gnits3.sh
 mode change 100755 => 100644 t/gnumake.sh
 mode change 100755 => 100644 t/gnuwarn.sh
 mode change 100755 => 100644 t/gnuwarn2.sh
 mode change 100755 => 100644 t/hdr-vars-defined-once.sh
 mode change 100755 => 100644 t/header.sh
 mode change 100755 => 100644 t/help-depend.sh
 mode change 100755 => 100644 t/help-depend2.sh
 mode change 100755 => 100644 t/help-dmalloc.sh
 mode change 100755 => 100644 t/help-init.sh
 mode change 100755 => 100644 t/help-lispdir.sh
 mode change 100755 => 100644 t/help-python.sh
 mode change 100755 => 100644 t/help-silent.sh
 mode change 100755 => 100644 t/help-upc.sh
 mode change 100755 => 100644 t/help.sh
 mode change 100755 => 100644 t/help2.sh
 mode change 100755 => 100644 t/help3.sh
 mode change 100755 => 100644 t/help4.sh
 mode change 100755 => 100644 t/hfs.sh
 mode change 100755 => 100644 t/implicit.sh
 mode change 100755 => 100644 t/includes-deprecation.sh
 mode change 100755 => 100644 t/init.sh
 mode change 100755 => 100644 t/init2.sh
 mode change 100755 => 100644 t/insh2.sh
 mode change 100755 => 100644 t/install-info-dir.sh
 mode change 100755 => 100644 t/install2.sh
 mode change 100755 => 100644 t/installdir.sh
 mode change 100755 => 100644 t/instdat.sh
 mode change 100755 => 100644 t/instdat2.sh
 mode change 100755 => 100644 t/instdir-cond.sh
 mode change 100755 => 100644 t/instdir-cond2.sh
 mode change 100755 => 100644 t/instdir-java.sh
 mode change 100755 => 100644 t/instdir-lisp.sh
 mode change 100755 => 100644 t/instdir-ltlib.sh
 mode change 100755 => 100644 t/instdir-no-empty.sh
 mode change 100755 => 100644 t/instdir-prog.sh
 mode change 100755 => 100644 t/instdir-python.sh
 mode change 100755 => 100644 t/instdir-texi.sh
 mode change 100755 => 100644 t/instdir.sh
 mode change 100755 => 100644 t/instdir2.sh
 mode change 100755 => 100644 t/instexec.sh
 mode change 100755 => 100644 t/instfail-info.sh
 mode change 100755 => 100644 t/instfail-java.sh
 mode change 100755 => 100644 t/instfail-libtool.sh
 mode change 100755 => 100644 t/instfail.sh
 mode change 100755 => 100644 t/insthook.sh
 mode change 100755 => 100644 t/instman.sh
 mode change 100755 => 100644 t/instman2.sh
 mode change 100755 => 100644 t/instmany-mans.sh
 mode change 100755 => 100644 t/instmany-python.sh
 mode change 100755 => 100644 t/instmany.sh
 mode change 100755 => 100644 t/instsh.sh
 mode change 100755 => 100644 t/instsh2.sh
 mode change 100755 => 100644 t/instsh3.sh
 mode change 100755 => 100644 t/instspc.tap
 mode change 100755 => 100644 t/interp.sh
 mode change 100755 => 100644 t/interp2.sh
 mode change 100755 => 100644 t/java-check.sh
 mode change 100755 => 100644 t/java-clean.sh
 mode change 100755 => 100644 t/java-compile-install.sh
 mode change 100755 => 100644 t/java-compile-run-flat.sh
 mode change 100755 => 100644 t/java-compile-run-nested.sh
 mode change 100755 => 100644 t/java-empty-classpath.sh
 mode change 100755 => 100644 t/java-extra.sh
 mode change 100755 => 100644 t/java-mix.sh
 mode change 100755 => 100644 t/java-no-duplicate.sh
 mode change 100755 => 100644 t/java-nobase.sh
 mode change 100755 => 100644 t/java-noinst.sh
 mode change 100755 => 100644 t/java-rebuild.sh
 mode change 100755 => 100644 t/java-sources.sh
 mode change 100755 => 100644 t/java-uninstall.sh
 mode change 100755 => 100644 t/java.sh
 mode change 100755 => 100644 t/java2.sh
 mode change 100755 => 100644 t/java3.sh
 mode change 100755 => 100644 t/javadir-undefined.sh
 mode change 100755 => 100644 t/javaflags.sh
 mode change 100755 => 100644 t/javaprim.sh
 mode change 100755 => 100644 t/javasubst.sh
 mode change 100755 => 100644 t/ldadd.sh
 mode change 100755 => 100644 t/ldflags.sh
 mode change 100755 => 100644 t/lex-clean-cxx.sh
 mode change 100755 => 100644 t/lex-clean.sh
 mode change 100755 => 100644 t/lex-depend-cxx.sh
 mode change 100755 => 100644 t/lex-depend-grep.sh
 mode change 100755 => 100644 t/lex-depend.sh
 mode change 100755 => 100644 t/lex-header.sh
 mode change 100755 => 100644 t/lex-lib-external.sh
 mode change 100755 => 100644 t/lex-lib.sh
 mode change 100755 => 100644 t/lex-libobj.sh
 mode change 100755 => 100644 t/lex-line.sh
 mode change 100755 => 100644 t/lex-multiple.sh
 mode change 100755 => 100644 t/lex-nodist.sh
 mode change 100755 => 100644 t/lex-noyywrap.sh
 mode change 100755 => 100644 t/lex-pr204.sh
 mode change 100755 => 100644 t/lex-subobj-nodep.sh
 mode change 100755 => 100644 t/lex.sh
 mode change 100755 => 100644 t/lex2.sh
 mode change 100755 => 100644 t/lex3.sh
 mode change 100755 => 100644 t/lex5.sh
 mode change 100755 => 100644 t/lexcpp.sh
 mode change 100755 => 100644 t/lexvpath.sh
 mode change 100755 => 100644 t/lflags.sh
 mode change 100755 => 100644 t/lflags2.sh
 mode change 100755 => 100644 t/libexec.sh
 mode change 100755 => 100644 t/libobj-basic.sh
 mode change 100755 => 100644 t/libobj10.sh
 mode change 100755 => 100644 t/libobj12.sh
 mode change 100755 => 100644 t/libobj13.sh
 mode change 100755 => 100644 t/libobj14.sh
 mode change 100755 => 100644 t/libobj15a.sh
 mode change 100755 => 100644 t/libobj15b.sh
 mode change 100755 => 100644 t/libobj15c.sh
 mode change 100755 => 100644 t/libobj16a.sh
 mode change 100755 => 100644 t/libobj16b.sh
 mode change 100755 => 100644 t/libobj17.sh
 mode change 100755 => 100644 t/libobj18.sh
 mode change 100755 => 100644 t/libobj19.sh
 mode change 100755 => 100644 t/libobj2.sh
 delete mode 100755 t/libobj20a.sh
 mode change 100755 => 100644 t/libobj20b.sh
 mode change 100755 => 100644 t/libobj20c.sh
 mode change 100755 => 100644 t/libobj3.sh
 mode change 100755 => 100644 t/libobj4.sh
 mode change 100755 => 100644 t/libobj5.sh
 mode change 100755 => 100644 t/libobj7.sh
 mode change 100755 => 100644 t/library.sh
 mode change 100755 => 100644 t/library2.sh
 mode change 100755 => 100644 t/library3.sh
 mode change 100755 => 100644 t/libtoo10.sh
 mode change 100755 => 100644 t/libtoo11.sh
 mode change 100755 => 100644 t/libtool-macros.sh
 mode change 100755 => 100644 t/libtool.sh
 mode change 100755 => 100644 t/libtool2.sh
 mode change 100755 => 100644 t/libtool3.sh
 mode change 100755 => 100644 t/libtool4.sh
 mode change 100755 => 100644 t/libtool5.sh
 mode change 100755 => 100644 t/libtool6.sh
 mode change 100755 => 100644 t/libtool7.sh
 mode change 100755 => 100644 t/libtool8.sh
 mode change 100755 => 100644 t/libtool9.sh
 mode change 100755 => 100644 t/license.sh
 mode change 100755 => 100644 t/license2.sh
 mode change 100755 => 100644 t/link_c_cxx.sh
 mode change 100755 => 100644 t/link_cond.sh
 mode change 100755 => 100644 t/link_dist.sh
 mode change 100755 => 100644 t/link_f90_only.sh
 mode change 100755 => 100644 t/link_f_only.sh
 mode change 100755 => 100644 t/link_fc.sh
 mode change 100755 => 100644 t/link_fccxx.sh
 mode change 100755 => 100644 t/link_fcxx.sh
 mode change 100755 => 100644 t/link_override.sh
 mode change 100755 => 100644 t/lisp-flags.sh
 mode change 100755 => 100644 t/lisp-loadpath.sh
 mode change 100755 => 100644 t/lisp-pr11806.sh
 mode change 100755 => 100644 t/lisp-subdir-mix.sh
 mode change 100755 => 100644 t/lisp-subdir.sh
 mode change 100755 => 100644 t/lisp-subdir2.sh
 mode change 100755 => 100644 t/lisp2.sh
 mode change 100755 => 100644 t/lisp3.sh
 mode change 100755 => 100644 t/lisp4.sh
 mode change 100755 => 100644 t/lisp5.sh
 mode change 100755 => 100644 t/lisp6.sh
 mode change 100755 => 100644 t/lisp7.sh
 mode change 100755 => 100644 t/lisp8.sh
 mode change 100755 => 100644 t/lispdry.sh
 mode change 100755 => 100644 t/listval.sh
 mode change 100755 => 100644 t/location.sh
 mode change 100755 => 100644 t/longlin2.sh
 mode change 100755 => 100644 t/longline.sh
 mode change 100755 => 100644 t/ltcond.sh
 mode change 100755 => 100644 t/ltcond2.sh
 mode change 100755 => 100644 t/ltconv.sh
 mode change 100755 => 100644 t/ltdeps.sh
 mode change 100755 => 100644 t/ltinit.sh
 mode change 100755 => 100644 t/ltinstloc.sh
 mode change 100755 => 100644 t/ltlibobjs.sh
 mode change 100755 => 100644 t/ltlibsrc.sh
 mode change 100755 => 100644 t/ltorder.sh
 mode change 100755 => 100644 t/m4-inclusion.sh
 mode change 100755 => 100644 t/maintclean-vpath.sh
 mode change 100755 => 100644 t/maintclean.sh
 mode change 100755 => 100644 t/maintmode-configure-msg.sh
 mode change 100755 => 100644 t/make-dryrun.tap
 mode change 100755 => 100644 t/make-is-gnu.sh
 mode change 100755 => 100644 t/make-keepgoing.tap
 mode change 100755 => 100644 t/make.sh
 mode change 100755 => 100644 t/makefile-deps.sh
 mode change 100755 => 100644 t/makej.sh
 mode change 100755 => 100644 t/makej2.sh
 mode change 100755 => 100644 t/maken.sh
 mode change 100755 => 100644 t/maken3.sh
 mode change 100755 => 100644 t/makevars.sh
 mode change 100755 => 100644 t/man.sh
 mode change 100755 => 100644 t/man2.sh
 mode change 100755 => 100644 t/man3.sh
 mode change 100755 => 100644 t/man5.sh
 mode change 100755 => 100644 t/man6.sh
 mode change 100755 => 100644 t/man7.sh
 mode change 100755 => 100644 t/man8.sh
 mode change 100755 => 100644 t/mdate.sh
 mode change 100755 => 100644 t/mdate2.sh
 mode change 100755 => 100644 t/mdate3.sh
 mode change 100755 => 100644 t/mdate4.sh
 mode change 100755 => 100644 t/mdate5.sh
 mode change 100755 => 100644 t/mdate6.sh
 mode change 100755 => 100644 t/missing-auxfile-stops-makefiles-creation.sh
 mode change 100755 => 100644 t/missing-version-mismatch.sh
 mode change 100755 => 100644 t/missing3.sh
 mode change 100755 => 100644 t/mkinst2.sh
 mode change 100755 => 100644 t/mkinst3.sh
 mode change 100755 => 100644 t/mkinstall.sh
 mode change 100755 => 100644 t/mmode.sh
 mode change 100755 => 100644 t/mmodely.sh
 mode change 100755 => 100644 t/no-extra-makefile-code.sh
 mode change 100755 => 100644 t/no-spurious-install-recursive.sh
 mode change 100755 => 100644 t/nobase-libtool.sh
 mode change 100755 => 100644 t/nobase-nodist.sh
 mode change 100755 => 100644 t/nobase-python.sh
 mode change 100755 => 100644 t/nobase.sh
 mode change 100755 => 100644 t/nodef.sh
 mode change 100755 => 100644 t/nodef2.sh
 mode change 100755 => 100644 t/nodep.sh
 mode change 100755 => 100644 t/nodep2.sh
 mode change 100755 => 100644 t/nodepcomp.sh
 mode change 100755 => 100644 t/nodist.sh
 mode change 100755 => 100644 t/nodist2.sh
 mode change 100755 => 100644 t/nodist3.sh
 mode change 100755 => 100644 t/noinst.sh
 mode change 100755 => 100644 t/noinstdir.sh
 mode change 100755 => 100644 t/nolink.sh
 mode change 100755 => 100644 t/nostdinc.sh
 mode change 100755 => 100644 t/notrans.sh
 mode change 100755 => 100644 t/number.sh
 mode change 100755 => 100644 t/objc-basic.sh
 mode change 100755 => 100644 t/objc-deps.sh
 mode change 100755 => 100644 t/objc-flags.sh
 mode change 100755 => 100644 t/objc-megademo.sh
 mode change 100755 => 100644 t/objc-minidemo.sh
 mode change 100755 => 100644 t/objcxx-basic.sh
 mode change 100755 => 100644 t/objcxx-deps.sh
 mode change 100755 => 100644 t/objcxx-flags.sh
 mode change 100755 => 100644 t/objcxx-minidemo.sh
 mode change 100755 => 100644 t/objext-pr10128.sh
 mode change 100755 => 100644 t/oldvars.sh
 mode change 100755 => 100644 t/order.sh
 mode change 100755 => 100644 t/output-order.sh
 mode change 100755 => 100644 t/output.sh
 mode change 100755 => 100644 t/output10.sh
 mode change 100755 => 100644 t/output11.sh
 mode change 100755 => 100644 t/output12.sh
 mode change 100755 => 100644 t/output13.sh
 mode change 100755 => 100644 t/output2.sh
 mode change 100755 => 100644 t/output3.sh
 mode change 100755 => 100644 t/output4.sh
 mode change 100755 => 100644 t/output5.sh
 mode change 100755 => 100644 t/output6.sh
 mode change 100755 => 100644 t/output7.sh
 mode change 100755 => 100644 t/output8.sh
 mode change 100755 => 100644 t/output9.sh
 mode change 100755 => 100644 t/override-conditional-1.sh
 mode change 100755 => 100644 t/override-conditional-2.sh
 mode change 100755 => 100644 t/override-html.sh
 mode change 100755 => 100644 t/override-suggest-local.sh
 mode change 100755 => 100644 t/parallel-am.sh
 mode change 100755 => 100644 t/parallel-am2.sh
 mode change 100755 => 100644 t/parallel-am3.sh
 mode change 100755 => 100644 t/parallel-tests-basics.sh
 mode change 100755 => 100644 t/parallel-tests-cmdline-override.sh
 mode change 100755 => 100644 t/parallel-tests-concurrency-2.sh
 mode change 100755 => 100644 t/parallel-tests-concurrency.sh
 mode change 100755 => 100644 t/parallel-tests-console-output.sh
 mode change 100755 => 100644 t/parallel-tests-driver-install.sh
 mode change 100755 => 100644 t/parallel-tests-dry-run-1.sh
 mode change 100755 => 100644 t/parallel-tests-dry-run-2.sh
 mode change 100755 => 100644 t/parallel-tests-empty-testlogs.sh
 mode change 100755 => 100644 t/parallel-tests-empty.sh
 mode change 100755 => 100644 t/parallel-tests-exeext.sh
 mode change 100755 => 100644 t/parallel-tests-exit-statuses.sh
 mode change 100755 => 100644 t/parallel-tests-extra-programs.sh
 mode change 100755 => 100644 t/parallel-tests-fd-redirect-exeext.sh
 mode change 100755 => 100644 t/parallel-tests-fd-redirect.sh
 mode change 100755 => 100644 t/parallel-tests-fork-bomb.sh
 mode change 100755 => 100644 t/parallel-tests-generated-and-distributed.sh
 mode change 100755 => 100644 t/parallel-tests-harderror.sh
 mode change 100755 => 100644 t/parallel-tests-interrupt.tap
 mode change 100755 => 100644 t/parallel-tests-log-compiler-1.sh
 mode change 100755 => 100644 t/parallel-tests-log-compiler-2.sh
 mode change 100755 => 100644 t/parallel-tests-log-compiler-example.sh
 mode change 100755 => 100644 t/parallel-tests-log-override-1.sh
 mode change 100755 => 100644 t/parallel-tests-log-override-2.sh
 mode change 100755 => 100644 t/parallel-tests-log-override-recheck.sh
 mode change 100755 => 100644 t/parallel-tests-no-color-in-log.sh
 mode change 100755 => 100644 t/parallel-tests-no-spurious-summary.sh
 mode change 100755 => 100644 t/parallel-tests-once.sh
 mode change 100755 => 100644 t/parallel-tests-recheck-depends-on-all.sh
 mode change 100755 => 100644 t/parallel-tests-recheck-pr11791.sh
 mode change 100755 => 100644 t/parallel-tests-recheck.sh
 mode change 100755 => 100644 t/parallel-tests-reset-term.sh
 mode change 100755 => 100644 t/parallel-tests-subdir.sh
 mode change 100755 => 100644 t/parallel-tests-suffix-prog.sh
 mode change 100755 => 100644 t/parallel-tests-suffix.sh
 mode change 100755 => 100644 t/parallel-tests-trailing-whitespace.sh
 mode change 100755 => 100644 t/parallel-tests-unreadable.sh
 mode change 100755 => 100644 t/parse.sh
 mode change 100755 => 100644 t/per-target-flags.sh
 mode change 100755 => 100644 t/percent.sh
 mode change 100755 => 100644 t/percent2.sh
 mode change 100755 => 100644 t/phony.sh
 mode change 100755 => 100644 t/pkg-config-macros.sh
 mode change 100755 => 100644 t/pluseq.sh
 mode change 100755 => 100644 t/pluseq10.sh
 mode change 100755 => 100644 t/pluseq11.sh
 mode change 100755 => 100644 t/pluseq2.sh
 mode change 100755 => 100644 t/pluseq3.sh
 mode change 100755 => 100644 t/pluseq4.sh
 mode change 100755 => 100644 t/pluseq5.sh
 mode change 100755 => 100644 t/pluseq6.sh
 mode change 100755 => 100644 t/pluseq7.sh
 mode change 100755 => 100644 t/pluseq8.sh
 mode change 100755 => 100644 t/pluseq9.sh
 mode change 100755 => 100644 t/posixsubst-data.sh
 mode change 100755 => 100644 t/posixsubst-extradist.sh
 mode change 100755 => 100644 t/posixsubst-ldadd.sh
 mode change 100755 => 100644 t/posixsubst-libraries.sh
 mode change 100755 => 100644 t/posixsubst-ltlibraries.sh
 mode change 100755 => 100644 t/posixsubst-programs.sh
 mode change 100755 => 100644 t/posixsubst-scripts.sh
 mode change 100755 => 100644 t/posixsubst-sources.sh
 mode change 100755 => 100644 t/posixsubst-tests.sh
 mode change 100755 => 100644 t/postproc.sh
 mode change 100755 => 100644 t/ppf77.sh
 mode change 100755 => 100644 t/pr2.sh
 mode change 100755 => 100644 t/pr211.sh
 mode change 100755 => 100644 t/pr220.sh
 mode change 100755 => 100644 t/pr224.sh
 mode change 100755 => 100644 t/pr229.sh
 mode change 100755 => 100644 t/pr243.sh
 mode change 100755 => 100644 t/pr266.sh
 mode change 100755 => 100644 t/pr279-2.sh
 mode change 100755 => 100644 t/pr279.sh
 mode change 100755 => 100644 t/pr287.sh
 mode change 100755 => 100644 t/pr300-lib.sh
 mode change 100755 => 100644 t/pr300-ltlib.sh
 mode change 100755 => 100644 t/pr300-prog.sh
 mode change 100755 => 100644 t/pr307.sh
 mode change 100755 => 100644 t/pr401.sh
 mode change 100755 => 100644 t/pr401b.sh
 mode change 100755 => 100644 t/pr401c.sh
 mode change 100755 => 100644 t/pr72.sh
 mode change 100755 => 100644 t/pr87.sh
 mode change 100755 => 100644 t/pr9.sh
 mode change 100755 => 100644 t/prefix.sh
 mode change 100755 => 100644 t/preproc-basics.sh
 mode change 100755 => 100644 t/preproc-c-compile.sh
 mode change 100755 => 100644 t/preproc-demo.sh
 mode change 100755 => 100644 t/preproc-errmsg.sh
 mode change 100755 => 100644 t/primary-prefix-couples-documented-valid.sh
 mode change 100755 => 100644 t/primary-prefix-couples-force-valid.sh
 mode change 100755 => 100644 t/primary-prefix-invalid-couples.tap
 mode change 100755 => 100644 t/primary-prefix-valid-couples.sh
 mode change 100755 => 100644 t/primary.sh
 mode change 100755 => 100644 t/primary2.sh
 mode change 100755 => 100644 t/primary3.sh
 mode change 100755 => 100644 t/print-libdir.sh
 mode change 100755 => 100644 t/proginst.sh
 mode change 100755 => 100644 t/programs-primary-rewritten.sh
 mode change 100755 => 100644 t/py-compile-basedir.sh
 mode change 100755 => 100644 t/py-compile-basic.sh
 mode change 100755 => 100644 t/py-compile-destdir.sh
 mode change 100755 => 100644 t/py-compile-env.sh
 mode change 100755 => 100644 t/py-compile-option-terminate.sh
 mode change 100755 => 100644 t/py-compile-usage.sh
 mode change 100755 => 100644 t/python-am-path-iftrue.sh
 mode change 100755 => 100644 t/python-dist.sh
 mode change 100755 => 100644 t/python-missing.sh
 mode change 100755 => 100644 t/python-pr10995.sh
 mode change 100755 => 100644 t/python-too-old.sh
 mode change 100755 => 100644 t/python-vars.sh
 mode change 100755 => 100644 t/python-virtualenv.sh
 mode change 100755 => 100644 t/python.sh
 mode change 100755 => 100644 t/python10.sh
 mode change 100755 => 100644 t/python11.sh
 mode change 100755 => 100644 t/python12.sh
 mode change 100755 => 100644 t/python2.sh
 mode change 100755 => 100644 t/python3.sh
 mode change 100755 => 100644 t/recurs-user-deeply-nested.sh
 mode change 100755 => 100644 t/recurs-user-indir.sh
 mode change 100755 => 100644 t/recurs-user-keep-going.sh
 mode change 100755 => 100644 t/recurs-user-many.sh
 mode change 100755 => 100644 t/recurs-user-no-subdirs.sh
 mode change 100755 => 100644 t/recurs-user-no-top-level.sh
 mode change 100755 => 100644 t/recurs-user-override.sh
 mode change 100755 => 100644 t/recurs-user-phony.sh
 mode change 100755 => 100644 t/recurs-user-wrap.sh
 mode change 100755 => 100644 t/recurs-user.sh
 mode change 100755 => 100644 t/recurs-user2.sh
 mode change 100755 => 100644 t/relativize.tap
 mode change 100755 => 100644 t/remake-aclocal-version-mismatch.sh
 mode change 100755 => 100644 t/remake-after-acinclude-m4.sh
 mode change 100755 => 100644 t/remake-after-aclocal-m4.sh
 mode change 100755 => 100644 t/remake-after-configure-ac.sh
 mode change 100755 => 100644 t/remake-after-makefile-am.sh
 mode change 100755 => 100644 t/remake-all-1.sh
 mode change 100755 => 100644 t/remake-all-2.sh
 mode change 100755 => 100644 t/remake-am-pr10111.sh
 mode change 100755 => 100644 t/remake-config-status-dependencies.sh
 mode change 100755 => 100644 t/remake-configure-dependencies.sh
 mode change 100755 => 100644 t/remake-deeply-nested.sh
 mode change 100755 => 100644 t/remake-deleted-am-2.sh
 mode change 100755 => 100644 t/remake-deleted-am-subdir.sh
 mode change 100755 => 100644 t/remake-deleted-am.sh
 mode change 100755 => 100644 t/remake-deleted-m4-file.sh
 mode change 100755 => 100644 t/remake-fail.sh
 mode change 100755 => 100644 t/remake-gnulib-add-acsubst.sh
 mode change 100755 => 100644 t/remake-gnulib-add-header.sh
 mode change 100755 => 100644 t/remake-gnulib-remove-header.sh
 mode change 100755 => 100644 t/remake-include-aclocal.sh
 mode change 100755 => 100644 t/remake-include-configure.sh
 mode change 100755 => 100644 t/remake-include-makefile.sh
 mode change 100755 => 100644 t/remake-m4-pr10111.sh
 mode change 100755 => 100644 t/remake-macrodir.sh
 mode change 100755 => 100644 t/remake-maintainer-mode.sh
 mode change 100755 => 100644 t/remake-makefile-intree.sh
 mode change 100755 => 100644 t/remake-makefile-vpath.sh
 mode change 100755 => 100644 t/remake-mild-stress.sh
 mode change 100755 => 100644 t/remake-moved-m4-file.sh
 mode change 100755 => 100644 t/remake-not-after-make-dist.sh
 mode change 100755 => 100644 t/remake-recurs-user.sh
 mode change 100755 => 100644 t/remake-renamed-am.sh
 mode change 100755 => 100644 t/remake-renamed-m4-file.sh
 mode change 100755 => 100644 t/remake-renamed-m4-macro-and-file.sh
 mode change 100755 => 100644 t/remake-renamed-m4-macro.sh
 mode change 100755 => 100644 t/remake-subdir-from-subdir.sh
 mode change 100755 => 100644 t/remake-subdir-gnu.sh
 mode change 100755 => 100644 t/remake-subdir-grepping.sh
 mode change 100755 => 100644 t/remake-subdir-long-time.sh
 mode change 100755 => 100644 t/remake-subdir-no-makefile.sh
 mode change 100755 => 100644 t/remake-subdir-only.sh
 mode change 100755 => 100644 t/remake-subdir.sh
 mode change 100755 => 100644 t/remake-subdir2.sh
 mode change 100755 => 100644 t/remake-subdir3.sh
 mode change 100755 => 100644 t/remake-timing-bug-pr8365.sh
 mode change 100755 => 100644 t/repeated-options.sh
 mode change 100755 => 100644 t/reqd2.sh
 mode change 100755 => 100644 t/rm-f-probe.sh
 mode change 100755 => 100644 t/rulepat.sh
 mode change 100755 => 100644 t/sanity.sh
 mode change 100755 => 100644 t/seenc.sh
 mode change 100755 => 100644 t/self-check-cc-no-c-o.sh
 mode change 100755 => 100644 t/self-check-configure-help.sh
 mode change 100755 => 100644 t/self-check-dir.tap
 mode change 100755 => 100644 t/self-check-exit.tap
 mode change 100755 => 100644 t/self-check-explicit-skips.sh
 mode change 100755 => 100644 t/self-check-is-blocked-signal.tap
 mode change 100755 => 100644 t/self-check-is_newest.tap
 mode change 100755 => 100644 t/self-check-me.tap
 mode change 100755 => 100644 t/self-check-report.sh
 mode change 100755 => 100644 t/self-check-seq.tap
 mode change 100755 => 100644 t/self-check-shell-no-trail-bslash.sh
 mode change 100755 => 100644 t/self-check-unindent.tap
 mode change 100755 => 100644 t/serial-tests.sh
 mode change 100755 => 100644 t/silent-c.sh
 mode change 100755 => 100644 t/silent-configsite.sh
 mode change 100755 => 100644 t/silent-custom.sh
 mode change 100755 => 100644 t/silent-cxx.sh
 mode change 100755 => 100644 t/silent-f77.sh
 mode change 100755 => 100644 t/silent-f90.sh
 mode change 100755 => 100644 t/silent-gen.sh
 mode change 100755 => 100644 t/silent-lex.sh
 mode change 100755 => 100644 t/silent-lt.sh
 mode change 100755 => 100644 t/silent-many-languages.sh
 mode change 100755 => 100644 t/silent-nested-vars.sh
 mode change 100755 => 100644 t/silent-texi.sh
 mode change 100755 => 100644 t/silent-yacc-headers.sh
 mode change 100755 => 100644 t/silent-yacc.sh
 delete mode 100755 t/sourcefile-in-subdir.sh
 mode change 100755 => 100644 t/space.sh
 mode change 100755 => 100644 t/specflg-dummy.sh
 mode change 100755 => 100644 t/specflg6.sh
 mode change 100755 => 100644 t/specflg7.sh
 mode change 100755 => 100644 t/specflg8.sh
 mode change 100755 => 100644 t/specflg9.sh
 mode change 100755 => 100644 t/spell.sh
 mode change 100755 => 100644 t/spell2.sh
 mode change 100755 => 100644 t/spell3.sh
 mode change 100755 => 100644 t/spelling.sh
 mode change 100755 => 100644 t/spy-double-colon.sh
 mode change 100755 => 100644 t/spy-rm.tap
 mode change 100755 => 100644 t/src-acsubst.sh
 mode change 100755 => 100644 t/stamph2.sh
 mode change 100755 => 100644 t/stdinc.sh
 mode change 100755 => 100644 t/stdlib.sh
 mode change 100755 => 100644 t/stdlib2.sh
 mode change 100755 => 100644 t/strictness-override.sh
 mode change 100755 => 100644 t/strictness-precedence.sh
 mode change 100755 => 100644 t/strip.sh
 mode change 100755 => 100644 t/strip2.sh
 mode change 100755 => 100644 t/strip3.sh
 mode change 100755 => 100644 t/subdir-ac-subst.sh
 mode change 100755 => 100644 t/subdir-add-pr46.sh
 mode change 100755 => 100644 t/subdir-add2-pr46.sh
 mode change 100755 => 100644 t/subdir-am-cond.sh
 mode change 100755 => 100644 t/subdir-cond-err.sh
 mode change 100755 => 100644 t/subdir-cond-gettext.sh
 mode change 100755 => 100644 t/subdir-distclean.sh
 mode change 100755 => 100644 t/subdir-env-interference.sh
 mode change 100755 => 100644 t/subdir-keep-going-pr12554.sh
 mode change 100755 => 100644 t/subdir-order.sh
 mode change 100755 => 100644 t/subdir-subsub.sh
 mode change 100755 => 100644 t/subdir-with-slash.sh
 mode change 100755 => 100644 t/subdir.sh
 mode change 100755 => 100644 t/subobj-clean-lt-pr10697.sh
 mode change 100755 => 100644 t/subobj-clean-pr10697.sh
 mode change 100755 => 100644 t/subobj.sh
 mode change 100755 => 100644 t/subobj10.sh
 mode change 100755 => 100644 t/subobj11a.sh
 mode change 100755 => 100644 t/subobj11b.sh
 mode change 100755 => 100644 t/subobj11c.sh
 mode change 100755 => 100644 t/subobj2.sh
 delete mode 100755 t/subobj4.sh
 mode change 100755 => 100644 t/subobj5.sh
 mode change 100755 => 100644 t/subobj6.sh
 mode change 100755 => 100644 t/subobj7.sh
 mode change 100755 => 100644 t/subobj8.sh
 mode change 100755 => 100644 t/subobj9.sh
 mode change 100755 => 100644 t/subobjname.sh
 mode change 100755 => 100644 t/subpkg-macrodir.sh
 mode change 100755 => 100644 t/subpkg-yacc.sh
 mode change 100755 => 100644 t/subpkg.sh
 mode change 100755 => 100644 t/subpkg2.sh
 mode change 100755 => 100644 t/subpkg3.sh
 mode change 100755 => 100644 t/subpkg4.sh
 mode change 100755 => 100644 t/subst-no-trailing-empty-line.sh
 mode change 100755 => 100644 t/subst.sh
 mode change 100755 => 100644 t/subst3.sh
 mode change 100755 => 100644 t/subst4.sh
 mode change 100755 => 100644 t/subst5.sh
 mode change 100755 => 100644 t/substre2.sh
 mode change 100755 => 100644 t/substref.sh
 mode change 100755 => 100644 t/substtarg.sh
 mode change 100755 => 100644 t/suffix-chain.tap
 mode change 100755 => 100644 t/suffix-custom-subobj-and-specflg.sh
 mode change 100755 => 100644 t/suffix-custom-subobj.sh
 mode change 100755 => 100644 t/suffix.sh
 mode change 100755 => 100644 t/suffix10.tap
 mode change 100755 => 100644 t/suffix11.tap
 mode change 100755 => 100644 t/suffix2.sh
 mode change 100755 => 100644 t/suffix3.tap
 mode change 100755 => 100644 t/suffix4.sh
 mode change 100755 => 100644 t/suffix5.sh
 mode change 100755 => 100644 t/suffix6.sh
 mode change 100755 => 100644 t/suffix6b.sh
 mode change 100755 => 100644 t/suffix6c.sh
 mode change 100755 => 100644 t/suffix7.sh
 mode change 100755 => 100644 t/suffix8.tap
 mode change 100755 => 100644 t/suffix9.sh
 mode change 100755 => 100644 t/symlink.sh
 mode change 100755 => 100644 t/symlink2.sh
 mode change 100755 => 100644 t/syntax.sh
 mode change 100755 => 100644 t/tags-pr12372.sh
 mode change 100755 => 100644 t/tags.sh
 mode change 100755 => 100644 t/tags2.sh
 mode change 100755 => 100644 t/tagsub.sh
 mode change 100755 => 100644 t/tap-ambiguous-directive.sh
 mode change 100755 => 100644 t/tap-autonumber.sh
 mode change 100755 => 100644 t/tap-bad-prog.tap
 mode change 100755 => 100644 t/tap-bailout-and-logging.sh
 mode change 100755 => 100644 t/tap-bailout-leading-space.sh
 mode change 100755 => 100644 t/tap-bailout-suppress-badexit.sh
 mode change 100755 => 100644 t/tap-bailout-suppress-later-diagnostic.sh
 mode change 100755 => 100644 t/tap-bailout-suppress-later-errors.sh
 mode change 100755 => 100644 t/tap-bailout.sh
 mode change 100755 => 100644 t/tap-basic.sh
 mode change 100755 => 100644 t/tap-color.sh
 mode change 100755 => 100644 t/tap-common-setup.sh
 mode change 100755 => 100644 t/tap-deps.sh
 mode change 100755 => 100644 t/tap-diagnostic-custom.sh
 mode change 100755 => 100644 t/tap-diagnostic.sh
 mode change 100755 => 100644 t/tap-doc.sh
 mode change 100755 => 100644 t/tap-doc2.sh
 mode change 100755 => 100644 t/tap-driver-stderr.sh
 mode change 100755 => 100644 t/tap-empty-diagnostic.sh
 mode change 100755 => 100644 t/tap-empty.sh
 mode change 100755 => 100644 t/tap-escape-directive-2.sh
 mode change 100755 => 100644 t/tap-escape-directive.sh
 mode change 100755 => 100644 t/tap-exit.sh
 mode change 100755 => 100644 t/tap-fancy.sh
 mode change 100755 => 100644 t/tap-fancy2.sh
 mode change 100755 => 100644 t/tap-global-log.sh
 mode change 100755 => 100644 t/tap-global-result.sh
 mode change 100755 => 100644 t/tap-log.sh
 mode change 100755 => 100644 t/tap-merge-stdout-stderr.sh
 mode change 100755 => 100644 t/tap-missing-plan-and-bad-exit.sh
 mode change 100755 => 100644 t/tap-more.sh
 mode change 100755 => 100644 t/tap-more2.sh
 mode change 100755 => 100644 t/tap-msg0-bailout.sh
 mode change 100755 => 100644 t/tap-msg0-directive.sh
 mode change 100755 => 100644 t/tap-msg0-misc.sh
 mode change 100755 => 100644 t/tap-msg0-planskip.sh
 mode change 100755 => 100644 t/tap-msg0-result.sh
 mode change 100755 => 100644 t/tap-negative-numbers.sh
 mode change 100755 => 100644 t/tap-no-disable-hard-error.sh
 mode change 100755 => 100644 t/tap-no-merge-stdout-stderr.sh
 mode change 100755 => 100644 t/tap-no-spurious-numbers.sh
 mode change 100755 => 100644 t/tap-no-spurious-summary.sh
 mode change 100755 => 100644 t/tap-no-spurious.sh
 mode change 100755 => 100644 t/tap-not-ok-skip.sh
 mode change 100755 => 100644 t/tap-number-wordboundary.sh
 mode change 100755 => 100644 t/tap-numbers-leading-zero.sh
 mode change 100755 => 100644 t/tap-numeric-description.sh
 mode change 100755 => 100644 t/tap-out-of-order.sh
 mode change 100755 => 100644 t/tap-passthrough-exit.sh
 mode change 100755 => 100644 t/tap-passthrough.sh
 mode change 100755 => 100644 t/tap-plan-corner.sh
 mode change 100755 => 100644 t/tap-plan-errors.sh
 mode change 100755 => 100644 t/tap-plan-leading-zero.sh
 mode change 100755 => 100644 t/tap-plan-malformed.sh
 mode change 100755 => 100644 t/tap-plan-middle.sh
 mode change 100755 => 100644 t/tap-plan-whitespace.sh
 mode change 100755 => 100644 t/tap-plan.sh
 mode change 100755 => 100644 t/tap-planskip-and-logging.sh
 mode change 100755 => 100644 t/tap-planskip-badexit.sh
 mode change 100755 => 100644 t/tap-planskip-bailout.sh
 mode change 100755 => 100644 t/tap-planskip-case-insensitive.sh
 mode change 100755 => 100644 t/tap-planskip-late.sh
 mode change 100755 => 100644 t/tap-planskip-later-errors.sh
 mode change 100755 => 100644 t/tap-planskip-unplanned-corner.sh
 mode change 100755 => 100644 t/tap-planskip-unplanned.sh
 mode change 100755 => 100644 t/tap-planskip-whitespace.sh
 mode change 100755 => 100644 t/tap-planskip.sh
 mode change 100755 => 100644 t/tap-realtime.sh
 mode change 100755 => 100644 t/tap-recheck-logs.sh
 mode change 100755 => 100644 t/tap-recheck.sh
 mode change 100755 => 100644 t/tap-result-comment.sh
 mode change 100755 => 100644 t/tap-signal.tap
 mode change 100755 => 100644 t/tap-summary-color.sh
 mode change 100755 => 100644 t/tap-summary.sh
 mode change 100755 => 100644 t/tap-test-number-0.sh
 mode change 100755 => 100644 t/tap-todo-skip-together.sh
 mode change 100755 => 100644 t/tap-todo-skip-whitespace.sh
 mode change 100755 => 100644 t/tap-todo-skip.sh
 mode change 100755 => 100644 t/tap-unplanned.sh
 mode change 100755 => 100644 t/tap-whitespace-normalization.sh
 mode change 100755 => 100644 t/tap-with-and-without-number.sh
 mode change 100755 => 100644 t/tap-xfail-tests.sh
 mode change 100755 => 100644 t/tar-opts-errors.sh
 mode change 100755 => 100644 t/tar-override.sh
 mode change 100755 => 100644 t/tar-pax.sh
 mode change 100755 => 100644 t/tar-ustar-id-too-high.sh
 mode change 100755 => 100644 t/tar-ustar.sh
 mode change 100755 => 100644 t/target-cflags.sh
 mode change 100755 => 100644 t/targetclash.sh
 mode change 100755 => 100644 t/test-driver-acsubst.sh
 mode change 100755 => 100644 t/test-driver-cond.sh
 mode change 100755 => 100644 t/test-driver-create-log-dir.sh
 mode change 100755 => 100644 t/test-driver-custom-multitest-recheck.sh
 mode change 100755 => 100644 t/test-driver-custom-multitest-recheck2.sh
 mode change 100755 => 100644 t/test-driver-custom-multitest.sh
 mode change 100755 => 100644 t/test-driver-custom-no-extra-driver.sh
 mode change 100755 => 100644 t/test-driver-custom-xfail-tests.sh
 mode change 100755 => 100644 t/test-driver-custom.sh
 mode change 100755 => 100644 t/test-driver-fail.sh
 mode change 100755 => 100644 t/test-driver-is-distributed.sh
 mode change 100755 => 100644 t/test-driver-strip-vpath.sh
 mode change 100755 => 100644 t/test-driver-trs-suffix-registered.sh
 mode change 100755 => 100644 t/test-extensions-cond.sh
 mode change 100755 => 100644 t/test-extensions.sh
 mode change 100755 => 100644 t/test-harness-vpath-rewrite.sh
 mode change 100755 => 100644 t/test-log.sh
 mode change 100755 => 100644 t/test-logs-repeated.sh
 mode change 100755 => 100644 t/test-metadata-global-log.sh
 mode change 100755 => 100644 t/test-metadata-global-result.sh
 mode change 100755 => 100644 t/test-metadata-recheck.sh
 mode change 100755 => 100644 t/test-metadata-results.sh
 mode change 100755 => 100644 t/test-missing.sh
 mode change 100755 => 100644 t/test-missing2.sh
 mode change 100755 => 100644 t/test-trs-basic.sh
 mode change 100755 => 100644 t/test-trs-recover.sh
 mode change 100755 => 100644 t/test-trs-recover2.sh
 mode change 100755 => 100644 t/tests-environment-and-log-compiler.sh
 mode change 100755 => 100644 t/tests-environment-backcompat.sh
 mode change 100755 => 100644 t/tests-environment-fd-redirect.sh
 mode change 100755 => 100644 t/tests-environment.sh
 mode change 100755 => 100644 t/testsuite-summary-color.sh
 mode change 100755 => 100644 t/testsuite-summary-count-many.sh
 mode change 100755 => 100644 t/testsuite-summary-count.sh
 mode change 100755 => 100644 t/testsuite-summary-reference-log.sh
 mode change 100755 => 100644 t/transform.sh
 mode change 100755 => 100644 t/transform2.sh
 mode change 100755 => 100644 t/transform3.sh
 mode change 100755 => 100644 t/txinfo-absolute-srcdir-pr408.sh
 mode change 100755 => 100644 t/txinfo-add-missing-and-dist.sh
 mode change 100755 => 100644 t/txinfo-bsd-make-recurs.sh
 mode change 100755 => 100644 t/txinfo-builddir.sh
 mode change 100755 => 100644 t/txinfo-clean.sh
 mode change 100755 => 100644 t/txinfo-dvi-recurs.sh
 mode change 100755 => 100644 t/txinfo-info-in-srcdir.sh
 mode change 100755 => 100644 t/txinfo-makeinfo-error-no-clobber.sh
 mode change 100755 => 100644 t/txinfo-many-output-formats-vpath.sh
 mode change 100755 => 100644 t/txinfo-many-output-formats.sh
 mode change 100755 => 100644 t/txinfo-no-clutter.sh
 mode change 100755 => 100644 t/txinfo-no-extra-dist.sh
 mode change 100755 => 100644 t/txinfo-no-installinfo.sh
 mode change 100755 => 100644 t/txinfo-no-repeated-targets.sh
 mode change 100755 => 100644 t/txinfo-no-split.sh
 mode change 100755 => 100644 t/txinfo-nodist-info.sh
 mode change 100755 => 100644 t/txinfo-other-suffixes.sh
 mode change 100755 => 100644 t/txinfo-override-infodeps.sh
 mode change 100755 => 100644 t/txinfo-override-texinfo-tex.sh
 mode change 100755 => 100644 t/txinfo-setfilename-repeated.sh
 mode change 100755 => 100644 t/txinfo-setfilename-suffix-strip.sh
 mode change 100755 => 100644 t/txinfo-subdir-pr343.sh
 mode change 100755 => 100644 t/txinfo-tex-dist.sh
 mode change 100755 => 100644 t/txinfo-unrecognized-extension.sh
 mode change 100755 => 100644 t/txinfo-unrecognized-info-suffix.sh
 mode change 100755 => 100644 t/txinfo-vtexi.sh
 mode change 100755 => 100644 t/txinfo-vtexi2.sh
 mode change 100755 => 100644 t/txinfo-vtexi3.sh
 mode change 100755 => 100644 t/txinfo-vtexi4.sh
 mode change 100755 => 100644 t/txinfo-without-info-suffix.sh
 mode change 100755 => 100644 t/txinfo23.sh
 mode change 100755 => 100644 t/txinfo24.sh
 mode change 100755 => 100644 t/txinfo25.sh
 mode change 100755 => 100644 t/txinfo28.sh
 mode change 100755 => 100644 t/uninstall-fail.sh
 mode change 100755 => 100644 t/uninstall-pr9578.sh
 mode change 100755 => 100644 t/unused.sh
 mode change 100755 => 100644 t/upc.sh
 mode change 100755 => 100644 t/upc2.sh
 mode change 100755 => 100644 t/upc3.sh
 mode change 100755 => 100644 t/vala-configure.sh
 mode change 100755 => 100644 t/vala-grepping.sh
 mode change 100755 => 100644 t/vala-headers.sh
 mode change 100755 => 100644 t/vala-libs.sh
 mode change 100755 => 100644 t/vala-mix.sh
 mode change 100755 => 100644 t/vala-mix2.sh
 mode change 100755 => 100644 t/vala-non-recursive-setup.sh
 mode change 100755 => 100644 t/vala-parallel.sh
 mode change 100755 => 100644 t/vala-per-target-flags.sh
 mode change 100755 => 100644 t/vala-recursive-setup.sh
 mode change 100755 => 100644 t/vala-vapi.sh
 mode change 100755 => 100644 t/vala-vpath.sh
 mode change 100755 => 100644 t/var-recurs.sh
 mode change 100755 => 100644 t/var-recurs2.sh
 mode change 100755 => 100644 t/vars.sh
 mode change 100755 => 100644 t/vars3.sh
 mode change 100755 => 100644 t/vartar.sh
 mode change 100755 => 100644 t/vartypo2.sh
 mode change 100755 => 100644 t/vartypos.sh
 mode change 100755 => 100644 t/version3.sh
 mode change 100755 => 100644 t/version4.sh
 mode change 100755 => 100644 t/version6.sh
 mode change 100755 => 100644 t/version7.sh
 mode change 100755 => 100644 t/version8.sh
 mode change 100755 => 100644 t/vpath.sh
 mode change 100755 => 100644 t/warning-groups-win-over-strictness.sh
 mode change 100755 => 100644 t/warnings-obsolete-default.sh
 mode change 100755 => 100644 t/warnings-override.sh
 mode change 100755 => 100644 t/warnings-precedence.sh
 mode change 100755 => 100644 t/warnings-strictness-interactions.sh
 mode change 100755 => 100644 t/warnings-unknown.sh
 mode change 100755 => 100644 t/warnings-win-over-strictness.sh
 mode change 100755 => 100644 t/warnopts.sh
 mode change 100755 => 100644 t/werror.sh
 mode change 100755 => 100644 t/werror2.sh
 mode change 100755 => 100644 t/werror3.sh
 mode change 100755 => 100644 t/werror4.sh
 mode change 100755 => 100644 t/whoami.sh
 mode change 100755 => 100644 t/xsource.sh
 mode change 100755 => 100644 t/yacc-auxdir.sh
 mode change 100755 => 100644 t/yacc-basic.sh
 mode change 100755 => 100644 t/yacc-bison-skeleton-cxx.sh
 mode change 100755 => 100644 t/yacc-bison-skeleton.sh
 mode change 100755 => 100644 t/yacc-clean-cxx.sh
 mode change 100755 => 100644 t/yacc-clean.sh
 mode change 100755 => 100644 t/yacc-cxx-grepping.sh
 mode change 100755 => 100644 t/yacc-cxx.sh
 mode change 100755 => 100644 t/yacc-d-basic.sh
 mode change 100755 => 100644 t/yacc-d-cxx.sh
 mode change 100755 => 100644 t/yacc-d-vpath.sh
 mode change 100755 => 100644 t/yacc-deleted-headers.sh
 mode change 100755 => 100644 t/yacc-depend.sh
 mode change 100755 => 100644 t/yacc-depend2.sh
 mode change 100755 => 100644 t/yacc-dist-nobuild-subdir.sh
 mode change 100755 => 100644 t/yacc-dist-nobuild.sh
 mode change 100755 => 100644 t/yacc-dry.sh
 mode change 100755 => 100644 t/yacc-grepping.sh
 mode change 100755 => 100644 t/yacc-grepping2.sh
 mode change 100755 => 100644 t/yacc-headers-and-dist-pr47.sh
 mode change 100755 => 100644 t/yacc-line.sh
 mode change 100755 => 100644 t/yacc-misc.sh
 mode change 100755 => 100644 t/yacc-mix-c-cxx.sh
 mode change 100755 => 100644 t/yacc-nodist.sh
 mode change 100755 => 100644 t/yacc-pr204.sh
 mode change 100755 => 100644 t/yacc-subdir.sh
 mode change 100755 => 100644 t/yacc-vpath.sh
 mode change 100755 => 100644 t/yacc-weirdnames.sh
 mode change 100755 => 100644 t/yflags-cmdline-override.sh
 mode change 100755 => 100644 t/yflags-conditional.sh
 mode change 100755 => 100644 t/yflags-d-false-positives.sh
 mode change 100755 => 100644 t/yflags-force-conditional.sh
 mode change 100755 => 100644 t/yflags-force-override.sh
 mode change 100755 => 100644 t/yflags-var-expand.sh
 mode change 100755 => 100644 t/yflags.sh
 mode change 100755 => 100644 t/yflags2.sh

diff --git a/HACKING b/HACKING
index 435eb77..fac35be 100644
--- a/HACKING
+++ b/HACKING
@@ -276,8 +276,6 @@
 
 * Use "make check" and "make maintainer-check" liberally.
 
-* Make sure each test file is executable.
-
 * Export the 'keep_testdirs' environment variable to "yes" to keep
   test directories for successful tests also.
 
diff --git a/NEWS b/NEWS
index 7472096..4a4fd88 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,15 @@
 New in 2.0:
 
+* Compilation and object files:
+
+ - If a source file is placed in a subdirectory, the corresponding compiled
+   object will *always* be put into the subdirectory named after the source
+   file, rather than in the current directory.  For instance, 'src/file.c'
+   and 'src/file.f90' will be compiled to 'src/file.o', and 'sub/dir/mu.cc'
+   will be compiled to 'sub/dir/mu.o'.  Put in another way, Automake 1.14
+   and later will *unconditionally* behave as older Automake versions did
+   when the 'subdir-objects' option was given.
+
 * Aclocal search path:
 
   - Third-party m4 files located in the system-wide aclocal directory,
@@ -209,6 +219,15 @@ New in 1.14:
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+New in 1.13.3:
+
+* Bugs fixed:
+
+  - Byte-compilation of Emacs lisp files could fail spuriously on Solaris,
+    when /bin/ksh or /usr/xpg4/bin/sh were used as shell.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 New in 1.13.2:
 
 * Documentation fixes:
diff --git a/PLANS/subdir-objects.txt b/PLANS/subdir-objects.txt
index 8647403..94c6305 100644
--- a/PLANS/subdir-objects.txt
+++ b/PLANS/subdir-objects.txt
@@ -3,7 +3,7 @@ Summary
 
 We want to make the behaviour currently enabled by the 'subdir-objects'
 the default one, and in fact the *only* one, in Automake 2.0.
-See automake bug#13378: <http://debbugs.gnu.org/13351>.
+See automake bug#13378: <http://debbugs.gnu.org/13378>.
 
 Details
 -------
@@ -38,29 +38,25 @@ C compilation rules mistakenly passed the "-c -o" options 
combination
 unconditionally (even to losing compiler) when the 'subdir-objects' was
 used but sources were only present in the top-level directory.
 
-TODO for automake 1.14
+DONE for automake 1.14
 ----------------------
 
-Give a warning in the category 'unsupported' if the 'subdir-objects'
+We give a warning in the category 'unsupported' if the 'subdir-objects'
 option is not specified.  This should give the users enough forewarning
 about the planned change, and give them time to update their packages
 to the new semantic.
 
-Be sure to avoid the warning when it would be irrelevant, i.e., if all
-source files sit in "current" directory (thanks to Peter Johansson for
-suggesting this).
+We also make sure to avoid the warning when it would be irrelevant, i.e.,
+if all source files sit in "current" directory (thanks to Peter Johansson
+for suggesting this).
 
 For automake 2.0
 ----------------
 
-Remove the copy & paste of Autoconf internals in our AC_PROG_CC rewrite
-See the first patch in the series:
-<http://lists.gnu.org/archive/html/automake-patches/2013-01/msg00102.html>
-
 Make the behaviour once activated by the 'subdir-object' option mandatory.
 With that change, we'll drop support for the "old" behaviour of having
 object files derived from sources in a subdirectory being placed in the
 current directory rather than in that same subdirectory.
 
-Still keep the 'subdir-object' option supported (as a simple no-op
+Still keep the 'subdir-objects' option supported (as a simple no-op
 now), to save useless churn in our user's build systems.
diff --git a/bin/automake.in b/bin/automake.in
index db1dfe4..f51cfa7 100644
--- a/bin/automake.in
+++ b/bin/automake.in
@@ -178,14 +178,6 @@ my $gen_copyright = "\
 # PARTICULAR PURPOSE.
 ";
 
-# These constants are returned by the lang_*_rewrite functions.
-# LANG_SUBDIR means that the resulting object file should be in a
-# subdir if the source file is.  In this case the file name cannot
-# have '..' components.
-use constant LANG_IGNORE  => 0;
-use constant LANG_PROCESS => 1;
-use constant LANG_SUBDIR  => 2;
-
 # These are used when keeping track of whether an object can be built
 # by two different paths.
 use constant COMPILE_LIBTOOL  => 1;
@@ -622,7 +614,6 @@ register_language ('name' => 'c',
                   'ld' => '$(CC)',
                   'linker' => 'LINK',
                   'link' => '$(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) 
$(LDFLAGS) -o $@',
-                  'compile_flag' => '-c',
                   'libtool_tag' => 'CC',
                   'extensions' => ['.c']);
 
@@ -637,8 +628,6 @@ register_language ('name' => 'cxx',
                   'compile' => "\$(CXX) @cpplike_flags \$(AM_CXXFLAGS) 
\$(CXXFLAGS)",
                   'ccer' => 'CXX',
                   'compiler' => 'CXXCOMPILE',
-                  'compile_flag' => '-c',
-                  'output_flag' => '-o',
                   'libtool_tag' => 'CXX',
                   'lder' => 'CXXLD',
                   'ld' => '$(CXX)',
@@ -656,8 +645,6 @@ register_language ('name' => 'objc',
                   'compile' => "\$(OBJC) @cpplike_flags \$(AM_OBJCFLAGS) 
\$(OBJCFLAGS)",
                   'ccer' => 'OBJC',
                   'compiler' => 'OBJCCOMPILE',
-                  'compile_flag' => '-c',
-                  'output_flag' => '-o',
                   'lder' => 'OBJCLD',
                   'ld' => '$(OBJC)',
                   'pure' => 1,
@@ -674,8 +661,6 @@ register_language ('name' => 'objcxx',
                   'compile' => "\$(OBJCXX) @cpplike_flags \$(AM_OBJCXXFLAGS) 
\$(OBJCXXFLAGS)",
                   'ccer' => 'OBJCXX',
                   'compiler' => 'OBJCXXCOMPILE',
-                  'compile_flag' => '-c',
-                  'output_flag' => '-o',
                   'lder' => 'OBJCXXLD',
                   'ld' => '$(OBJCXX)',
                   'pure' => 1,
@@ -692,8 +677,6 @@ register_language ('name' => 'upc',
                   'compile' => "\$(UPC) @cpplike_flags \$(AM_UPCFLAGS) 
\$(UPCFLAGS)",
                   'ccer' => 'UPC',
                   'compiler' => 'UPCCOMPILE',
-                  'compile_flag' => '-c',
-                  'output_flag' => '-o',
                   'lder' => 'UPCLD',
                   'ld' => '$(UPC)',
                   'pure' => 1,
@@ -709,7 +692,7 @@ register_language ('name' => 'header',
                   # Nothing to do.
                   '_finish' => sub { });
 
-# Vala
+# Vala.
 register_language ('name' => 'vala',
                   'Name' => 'Vala',
                   'config_vars' => ['VALAC'],
@@ -717,9 +700,10 @@ register_language ('name' => 'vala',
                   'compile' => '$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS)',
                   'ccer' => 'VALAC',
                   'compiler' => 'VALACOMPILE',
-                  'extensions' => ['.vala'],
-                  'output_extensions' => sub { (my $ext = $_[0]) =~ s/vala$/c/;
-                                               return ($ext,) },
+                  'extensions' => ['.vala', '.vapi'],
+                   # Vala compilation must be handled in a special way, so
+                   # nothing to do or return here.
+                  'output_extensions' => sub { },
                   'rule_file' => 'vala',
                   '_finish' => \&lang_vala_finish,
                   '_target_hook' => \&lang_vala_target_hook,
@@ -797,8 +781,6 @@ register_language ('name' => 'asm',
                   'compile' => '$(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)',
                   'ccer' => 'CCAS',
                   'compiler' => 'CCASCOMPILE',
-                  'compile_flag' => '-c',
-                  'output_flag' => '-o',
                   'extensions' => ['.s']);
 
 # Preprocessed Assembler.
@@ -811,8 +793,6 @@ register_language ('name' => 'cppasm',
                   'compile' => "\$(CCAS) @cpplike_flags \$(AM_CCASFLAGS) 
\$(CCASFLAGS)",
                   'ccer' => 'CPPAS',
                   'compiler' => 'CPPASCOMPILE',
-                  'compile_flag' => '-c',
-                  'output_flag' => '-o',
                   'extensions' => ['.S', '.sx']);
 
 # Fortran 77
@@ -825,8 +805,6 @@ register_language ('name' => 'f77',
                   'compile' => '$(F77) $(AM_FFLAGS) $(FFLAGS)',
                   'ccer' => 'F77',
                   'compiler' => 'F77COMPILE',
-                  'compile_flag' => '-c',
-                  'output_flag' => '-o',
                   'libtool_tag' => 'F77',
                   'lder' => 'F77LD',
                   'ld' => '$(F77)',
@@ -843,8 +821,6 @@ register_language ('name' => 'fc',
                   'compile' => '$(FC) $(AM_FCFLAGS) $(FCFLAGS)',
                   'ccer' => 'FC',
                   'compiler' => 'FCCOMPILE',
-                  'compile_flag' => '-c',
-                  'output_flag' => '-o',
                   'libtool_tag' => 'FC',
                   'lder' => 'FCLD',
                   'ld' => '$(FC)',
@@ -863,8 +839,6 @@ register_language ('name' => 'ppfc',
                   'ccer' => 'PPFC',
                   'compiler' => 'PPFCCOMPILE',
                   'compile' => "\$(FC) @cpplike_flags \$(AM_FCFLAGS) 
\$(FCFLAGS)",
-                  'compile_flag' => '-c',
-                  'output_flag' => '-o',
                   'libtool_tag' => 'FC',
                   'pure' => 1,
                   'extensions' => ['.F90','.F95', '.F03', '.F08']);
@@ -895,8 +869,6 @@ register_language ('name' => 'ppf77',
                   'ccer' => 'PPF77',
                   'compiler' => 'PPF77COMPILE',
                   'compile' => "\$(F77) @cpplike_flags \$(AM_FFLAGS) 
\$(FFLAGS)",
-                  'compile_flag' => '-c',
-                  'output_flag' => '-o',
                   'libtool_tag' => 'F77',
                   'pure' => 1,
                   'extensions' => ['.F']);
@@ -914,8 +886,6 @@ register_language ('name' => 'ratfor',
                   'compile' => '$(F77) $(AM_FFLAGS) $(FFLAGS) $(AM_RFLAGS) 
$(RFLAGS)',
                   'ccer' => 'F77',
                   'compiler' => 'RCOMPILE',
-                  'compile_flag' => '-c',
-                  'output_flag' => '-o',
                   'libtool_tag' => 'F77',
                   'pure' => 1,
                   'extensions' => ['.r']);
@@ -931,8 +901,6 @@ register_language ('name' => 'java',
                   'compile' => '$(GCJ) $(AM_GCJFLAGS) $(GCJFLAGS)',
                   'ccer' => 'GCJ',
                   'compiler' => 'GCJCOMPILE',
-                  'compile_flag' => '-c',
-                  'output_flag' => '-o',
                   'libtool_tag' => 'GCJ',
                   'lder' => 'GCJLD',
                   'ld' => '$(GCJ)',
@@ -1289,10 +1257,8 @@ sub handle_languages ()
                         'FPFX'    => $fpfx,
                         'AMDEP'   => $AMDEP,
                         'FASTDEP' => $FASTDEP,
-                        '-c'      => $lang->compile_flag || '',
                         # These are not used, but they need to be defined
-                        # so transform() do not complain.
-                        SUBDIROBJ     => 0,
+                        # so transform() does not complain.
                         'DERIVED-EXT' => 'BUG',
                         DIST_SOURCE   => 1,
                         VERBOSE   => $verbose,
@@ -1304,39 +1270,17 @@ sub handle_languages ()
        if (((! option 'no-dependencies') && $lang->autodep ne 'no')
            || defined $lang->compile)
        {
-           # Some C compilers don't support -c -o.  Use it only if really
-           # needed.
-           my $output_flag = $lang->output_flag || '';
-           $output_flag = '-o'
-             if (! $output_flag
-                 && $lang->name eq 'c'
-                 && option 'subdir-objects');
-
            # Compute a possible derived extension.
            # This is not used by depend2.am.
            my $der_ext = ($lang->output_extensions->($ext))[0];
 
-           # When we output an inference rule like '.c.o:' we
-           # have two cases to consider: either subdir-objects
-           # is used, or it is not.
-           #
-           # In the latter case the rule is used to build objects
-           # in the current directory, and dependencies always
-           # go into './$(DEPDIR)/'.  We can hard-code this value.
-           #
-           # In the former case the rule can be used to build
-           # objects in sub-directories too.  Dependencies should
-           # go into the appropriate sub-directories, e.g.,
-           # 'sub/$(DEPDIR)/'.  The value of this directory
-           # needs to be computed on-the-fly.
-           #
-           # DEPBASE holds the name of this directory, plus the
-           # basename part of the object file (extensions Po, TPo,
-           # Plo, TPlo will be added later as appropriate).  It is
-           # either hardcoded, or a shell variable ('$depbase') that
-           # will be computed by the rule.
-           my $depbase =
-             option ('subdir-objects') ? '$$depbase' : '$(DEPDIR)/$*';
+            # Even when subdir sources are present, an inference rule
+            # like '.c.o:' can be used to build corresponding objects
+            # in the sane subdirectory too.  We should be careful to also
+            # place dependency files into the appropriate subdirectory,
+            # e.g., 'sub/$(DEPDIR)/'.  The value of this directory needs
+            # to be computed on-the-fly (that is done by our makefile
+            # recipes in 'depend2.am').
            $output_rules .=
              file_contents ($rule_file,
                             new Automake::Location,
@@ -1345,9 +1289,9 @@ sub handle_languages ()
 
                             'DERIVED-EXT' => $der_ext,
 
-                            DEPBASE   => $depbase,
                             BASE      => '$*',
                             SOURCE    => '$<',
+                            XSOURCE   => '$<',
                             SOURCEFLAG => $sourceflags{$ext} || '',
                             OBJ       => '$@',
                             OBJOBJ    => '$@',
@@ -1355,8 +1299,7 @@ sub handle_languages ()
 
                             COMPILE   => '$(' . $lang->compiler . ')',
                             LTCOMPILE => '$(LT' . $lang->compiler . ')',
-                            -o        => $output_flag,
-                            SUBDIROBJ => !! option 'subdir-objects');
+                           );
        }
 
        # Now include code for each specially handled object with this
@@ -1400,15 +1343,8 @@ sub handle_languages ()
              "\$(LIBTOOL) $ltverbose $libtool_tag\$($ptltflags) 
\$(LIBTOOLFLAGS) "
              . "--mode=compile $obj_compile";
 
-           # We _need_ '-o' for per object rules.
-           my $output_flag = $lang->output_flag || '-o';
-
-           my $depbase = dirname ($obj);
-           $depbase = ''
-               if $depbase eq '.';
-           $depbase .= '/'
-               unless $depbase eq '';
-           $depbase .= '$(DEPDIR)/' . basename ($obj);
+            # For non-suffix rules, we must emulate a VPATH search.
+            my $xsource = "`test -f '$source' || echo '\$(srcdir)/'`$source";
 
            $output_rules .=
              file_contents ($rule_file,
@@ -1416,9 +1352,9 @@ sub handle_languages ()
                             %transform,
                             GENERIC   => 0,
 
-                            DEPBASE   => $depbase,
                             BASE      => $obj,
                             SOURCE    => $source,
+                            XSOURCE   => $xsource,
                             SOURCEFLAG => $sourceflags{$srcext} || '',
                             # Use $myext and not '.o' here, in case
                             # we are actually building a new source
@@ -1432,7 +1368,6 @@ sub handle_languages ()
                             SILENT    => $silent,
                             COMPILE   => $obj_compile,
                             LTCOMPILE => $obj_ltcompile,
-                            -o        => $output_flag,
                             %file_transform);
        }
 
@@ -1593,10 +1528,6 @@ sub handle_single_transform
          next;
        }
 
-       # If the source file is in a subdirectory then the '.o' is put
-       # into the current directory, unless the subdir-objects option
-       # is in effect.
-
        # Split file name into base and extension.
        next if ! /^(?:(.*)\/)?([^\/]*)($KNOWN_EXTENSIONS_PATTERN)$/;
        my $full = $_;
@@ -1640,20 +1571,24 @@ sub handle_single_transform
                  }
              }
 
-           # Note: computed subr call.  The language rewrite function
-           # should return one of the LANG_* constants.  It could
-           # also return a list whose first value is such a constant
-           # and whose second value is a new source extension which
-           # should be applied.  This means this particular language
-           # generates another source file which we must then process
-           # further.
-           my $subr = \&{'lang_' . $lang->name . '_rewrite'};
-           defined &$subr or $subr = \&lang_sub_obj;
-           my ($r, $source_extension)
-               = &$subr ($directory, $base, $extension,
-                         $obj, $have_per_exec_flags, $var);
-           # Skip this entry if we were asked not to process it.
-           next if $r == LANG_IGNORE;
+            # NOTE: computed subr calls here.
+
+            # The language ignore function can ask not to preprocess
+            # a source file further.
+            my $subr_ignore = \&{'lang_' . $lang->name . '_ignore'};
+            next if defined &$subr_ignore
+                    and &$subr_ignore ($directory, $base, $extension);
+            # The language rewrite function can return a new source
+            # extension which should be applied.  This means this
+            # particular language generates another source file which
+            # we must then process further.  This happens, for example,
+            # with yacc and lex.
+            my $subr_rewrite = \&{'lang_' . $lang->name . '_rewrite'};
+            $subr_rewrite = sub { } unless defined &$subr_rewrite;
+            my $source_extension = &$subr_rewrite ($directory, $base,
+                                                   $extension, $obj,
+                                                   $have_per_exec_flags,
+                                                   $var);
 
            # Now extract linker and other info.
            $linker = $lang->linker;
@@ -1701,49 +1636,15 @@ sub handle_single_transform
                $renamed = 1;
            }
 
-           # If rewrite said it was ok, put the object into a
-           # subdir.
-           if ($directory ne '')
-           {
-              if ($r == LANG_SUBDIR)
-                {
-                  $object = $directory . '/' . $object;
-                }
-              else
-                {
-                  # Since the next major version of automake (2.0) will
-                  # make the behaviour so far only activated with the
-                  # 'subdir-object' option mandatory, it's better if we
-                  # start warning users not using that option.
-                  # As suggested by Peter Johansson, we strive to avoid
-                  # the warning when it would be irrelevant, i.e., if
-                  # all source files sit in "current" directory.
-                  msg_var 'unsupported', $var,
-                          "source file '$full' is in a subdirectory,"
-                          . "\nbut option 'subdir-objects' is disabled";
-                  msg 'unsupported', INTERNAL, <<'EOF', uniq_scope => 
US_GLOBAL;
-possible forward-incompatibility.
-At least a source file is in a subdirectory, but the 'subdir-objects'
-automake option hasn't been enabled.  For now, the corresponding output
-object file(s) will be placed in the top-level directory.  However,
-this behaviour will change in future Automake versions: they will
-unconditionally cause object files to be placed in the same subdirectory
-of the corresponding sources.
-You are advised to start using 'subdir-objects' option throughout your
-project, to avoid future incompatibilities.
-EOF
-                }
-           }
+           # If rewrite said it was ok, put the object into a subdir.
+           $object = $directory . '/' . $object
+             unless $directory eq '';
 
            # If the object file has been renamed (because per-target
            # flags are used) we cannot compile the file with an
            # inference rule: we need an explicit rule.
            #
-           # If the source is in a subdirectory and the object is in
-           # the current directory, we also need an explicit rule.
-           #
            # If both source and object files are in a subdirectory
-           # (this happens when the subdir-objects option is used),
            # then the inference will work.
            #
            # The latter case deserves a historical note.  When the
@@ -1765,7 +1666,6 @@ EOF
            # with GNU make, Solaris make, Ultrix make, BSD make,
            # HP-UX make, and OSF1 make successfully.
            if ($renamed
-               || ($directory ne '' && ! option 'subdir-objects')
                # We must also use specific rules for a nodist_ source
                # if its language requests it.
                || ($lang->nodist_specific && ! $transform{'DIST_SOURCE'}))
@@ -1832,6 +1732,8 @@ EOF
            next;
        }
 
+        # FIXME: this is likely an internal error now that we use
+        # FIXME: subdir-objects unconditionally ...
        err_am "object '$object' created by '$full' and '$object_map{$object}'"
          if (defined $object_map{$object}
              && $object_map{$object} ne $full);
@@ -2218,27 +2120,19 @@ sub handle_LIBOBJS_or_ALLOCA
   if ($config_libobj_dir
       && $relative_dir ne $config_libobj_dir)
     {
-      if (option 'subdir-objects')
-       {
-         # In the top-level Makefile we do not use $(top_builddir), because
-         # we are already there, and since the targets are built without
-         # a $(top_builddir), it helps BSD Make to match them with
-         # dependencies.
-         $dir = "$config_libobj_dir/"
-           if $config_libobj_dir ne '.';
-         $dir = backname ($relative_dir) . "/$dir"
-           if $relative_dir ne '.';
-         define_variable ('LIBOBJDIR', "$dir", INTERNAL);
-         $clean_files{"\$($var)"} = MOSTLY_CLEAN;
-         # If LTLIBOBJS is used, we must also clear LIBOBJS (which might
-         # be created by libtool as a side-effect of creating LTLIBOBJS).
-         $clean_files{"\$($var)"} = MOSTLY_CLEAN if $var =~ s/^LT//;
-       }
-      else
-       {
-         error ("'\$($var)' cannot be used outside '$config_libobj_dir' if"
-                . " 'subdir-objects' is not set");
-       }
+      # In the top-level Makefile we do not use $(top_builddir), because
+      # we are already there, and since the targets are built without
+      # a $(top_builddir), it helps BSD Make to match them with
+      # dependencies.
+      $dir = "$config_libobj_dir/"
+      if $config_libobj_dir ne '.';
+      $dir = backname ($relative_dir) . "/$dir"
+      if $relative_dir ne '.';
+      define_variable ('LIBOBJDIR', "$dir", INTERNAL);
+      $clean_files{"\$($var)"} = MOSTLY_CLEAN;
+      # If LTLIBOBJS is used, we must also clear LIBOBJS (which might
+      # be created by libtool as a side-effect of creating LTLIBOBJS).
+      $clean_files{"\$($var)"} = MOSTLY_CLEAN if $var =~ s/^LT//;
     }
 
   return $dir;
@@ -5171,9 +5065,7 @@ sub scan_autoconf_traces
       elsif ($macro eq 'AC_FC_SRCEXT')
        {
          my $suffix = $args[1];
-         # These flags are used as %SOURCEFLAG% in depend2.am,
-         # where the trailing space is important.
-         $sourceflags{'.' . $suffix} = '$(FCFLAGS_' . $suffix . ') '
+         $sourceflags{'.' . $suffix} = '$(FCFLAGS_' . $suffix . ')'
            if ($suffix eq 'f90' || $suffix eq 'f95' || $suffix eq 'f03' || 
$suffix eq 'f08');
        }
       elsif ($macro eq 'AC_INIT')
@@ -5461,48 +5353,37 @@ sub check_gnits_standards ()
 #
 # Functions to handle files of each language.
 
-# Each 'lang_X_rewrite($DIRECTORY, $BASE, $EXT)' function follows a
-# simple formula: Return value is LANG_SUBDIR if the resulting object
-# file should be in a subdir if the source file is, LANG_PROCESS if
-# file is to be dealt with, LANG_IGNORE otherwise.
-
 # Much of the actual processing is handled in
 # handle_single_transform.  These functions exist so that
 # auxiliary information can be recorded for a later cleanup pass.
 # Note that the calls to these functions are computed, so don't bother
 # searching for their precise names in the source.
 
-# This is just a convenience function that can be used to determine
-# when a subdir object should be used.
-sub lang_sub_obj ()
-{
-    return option 'subdir-objects' ? LANG_SUBDIR : LANG_PROCESS;
-}
+# Header files are simply ignored.
+sub lang_header_ignore { 1; }
 
-# Rewrite a single header file.
-sub lang_header_rewrite
+# Vala '.vapi' are a kind of header files as well, and should
+# not be processed into compilation rules.
+ sub lang_vala_ignore
 {
-    # Header files are simply ignored.
-    return LANG_IGNORE;
+    my ($directory, $base, $ext) = @_;
+    return ($ext =~ m/\.vapi$/ ? 1 : 0);
 }
 
 # Rewrite a single Vala source file.
 sub lang_vala_rewrite
 {
     my ($directory, $base, $ext) = @_;
-
-    (my $newext = $ext) =~ s/vala$/c/;
-    return (LANG_SUBDIR, $newext);
+    $ext =~ s/vala$/c/;
+    return $ext;
 }
 
 # Rewrite a single yacc/yacc++ file.
 sub lang_yacc_rewrite
 {
     my ($directory, $base, $ext) = @_;
-
-    my $r = lang_sub_obj;
-    (my $newext = $ext) =~ tr/y/c/;
-    return ($r, $newext);
+    $ext =~ tr/y/c/;
+    return $ext;
 }
 sub lang_yaccxx_rewrite { lang_yacc_rewrite (@_); };
 
@@ -5510,19 +5391,11 @@ sub lang_yaccxx_rewrite { lang_yacc_rewrite (@_); };
 sub lang_lex_rewrite
 {
     my ($directory, $base, $ext) = @_;
-
-    my $r = lang_sub_obj;
-    (my $newext = $ext) =~ tr/l/c/;
-    return ($r, $newext);
+    $ext =~ tr/l/c/;
+    return $ext;
 }
 sub lang_lexxx_rewrite { lang_lex_rewrite (@_); };
 
-# Rewrite a single Java file.
-sub lang_java_rewrite
-{
-    return LANG_SUBDIR;
-}
-
 # The lang_X_finish functions are called after all source file
 # processing is done.  Each should handle defining rules for the
 # language, etc.  A finish function is only called if a source file of
diff --git a/doc/automake.texi b/doc/automake.texi
index 4912d38..8965fb6 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -5633,18 +5633,13 @@ nodist_maude_SOURCES = nodist.c
 dist_maude_SOURCES = dist-me.c
 @end example
 
-By default the output file (on Unix systems, the @file{.o} file) will
-be put into the current build directory.  However, if the option
address@hidden is in effect in the current directory then the
address@hidden file will be put into the subdirectory named after the
-source file.  For instance, with @option{subdir-objects} enabled,
address@hidden/dir/file.c} will be compiled to @file{sub/dir/file.o}.  Some
-people prefer this mode of operation.  You can specify
address@hidden in @code{AUTOMAKE_OPTIONS} (@pxref{Options}).
+The output file (on Unix systems, the @file{.o} file) will be put into the
+subdirectory named after the source file.  For instance @file{file.c} will
+compiled to @file{file.o}, while @file{sub/dir/file.c} will be compiled to
address@hidden/dir/file.o}.
 @cindex Subdirectory, objects in
 @cindex Objects in subdirectory
 
-
 @item EXTRA_maude_SOURCES
 Automake needs to know the list of files you intend to compile
 @emph{statically}.  For one thing, this is the only way Automake has of
@@ -6038,19 +6033,15 @@ tool1_SOURCES = @dots{}
 tool2_SOURCES = @dots{}
 @end example
 
-When option @option{subdir-objects} is not used, as in the above
-example, the variables @samp{$(LIBOBJS)} or @samp{$(ALLOCA)} can only
-be used in the directory where their sources lie.  E.g., here it would
-be wrong to use @samp{$(LIBOBJS)} or @samp{$(ALLOCA)} in
address@hidden/Makefile.am}.  However if both @option{subdir-objects} and
address@hidden are used, it is OK to use these variables
+The variables @samp{$(LIBOBJS)} or @samp{$(ALLOCA)} are typically
+used in the directory where their sources lie.  However, if
address@hidden is used, it is OK to use these variables
 in other directories.  For instance @file{src/Makefile.am} could be
 changed as follows.
 
 @example
 # src/Makefile.am
 
-AUTOMAKE_OPTIONS = subdir-objects
 LDADD = $(LIBOBJS) $(ALLOCA)
 
 bin_PROGRAMS = tool1 tool2 @dots{}
@@ -10228,11 +10219,8 @@ AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = false$(EXEEXT) 
true.sh
 @item @option{subdir-objects}
 @cindex Options, @option{subdir-objects}
 @opindex subdir-objects
-If this option is specified, then objects are placed into the
-subdirectory of the build directory corresponding to the subdirectory of
-the source file.  For instance, if the source file is
address@hidden/file.cxx}, then the output file would be
address@hidden/file.o}.
+This option does nothing; it exists solely for compatibility with
+older Automake versions.
 
 @anchor{tar-formats}
 @item @option{tar-v7}
diff --git a/gen-testsuite-part b/gen-testsuite-part
index 93d63aa..4584d2b 100755
--- a/gen-testsuite-part
+++ b/gen-testsuite-part
@@ -313,7 +313,7 @@ while (my ($wrapped_test, $setup_list) = each 
%wrapper_setups)
         atomic_write $wrapper_test,
                      sub { write_wrapper_script $_[0], $wrapped_test,
                                                 $setup },
-                     0555;
+                     0444;
         # The generated test works by sourcing the original test, so that
         # it has to be re-run every time that changes ...
         print "$wbase.log: $wrapped_test\n";
@@ -391,7 +391,7 @@ foreach my $lt (TRUE, FALSE)
               exit \$?
 EOF
           },
-          0555);
+          0444);
       }
    }
 
diff --git a/lib/Automake/Language.pm b/lib/Automake/Language.pm
index a678e1e..68fbccf 100644
--- a/lib/Automake/Language.pm
+++ b/lib/Automake/Language.pm
@@ -39,8 +39,6 @@ Class::Struct::struct (
        'compiler'  => "\$",
        # Content of the compiling variable.
        'compile'  => "\$",
-       # Flag to require compilation without linking (-c).
-       'compile_flag' => "\$",
        'extensions' => '@',
        # A subroutine to compute a list of possible extensions of
        # the product given the input extensions.
@@ -70,8 +68,6 @@ Class::Struct::struct (
        # Content of the linker variable ($(CC)).
        'ld' => "\$",
 
-       # Flag to specify the output file (-o).
-       'output_flag' => "\$",
        '_finish' => "\$",
 
        # This is a subroutine which is called whenever we finally
diff --git a/lib/am/depend2.am b/lib/am/depend2.am
index 5c6439a..b975be2 100644
--- a/lib/am/depend2.am
+++ b/lib/am/depend2.am
@@ -32,59 +32,38 @@
 ## a package with gcc 3.x or later.  In this case we can skip the use of
 ## depcomp and easily inline the dependency tracking.
 
+if %?FIRST%
+## TODO: rewrite this to avoid extra forks once we can assume a POSIX shell.
+am__set_depbase = depbase=`echo $@ | sed 
's|[^/]*$$|$(DEPDIR)/&|;s|\.[^.]*$$||'`
+endif %?FIRST%
+
 if %?NONLIBTOOL%
 ?GENERIC?%EXT%.o:
 ?!GENERIC?%OBJ%: %SOURCE%
 if %FASTDEP%
-## In fast-dep mode, we can always use -o.
-## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?!GENERIC?     %VERBOSE%%COMPILE% -MT %OBJ% -MD -MP -MF %DEPBASE%.Tpo %-c% -o 
%OBJ% %SOURCEFLAG%`test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
-?!GENERIC?     %SILENT%$(am__mv) %DEPBASE%.Tpo %DEPBASE%.Po
-?GENERIC??!SUBDIROBJ?  %VERBOSE%%COMPILE% -MT %OBJ% -MD -MP -MF %DEPBASE%.Tpo 
%-c% -o %OBJ% %SOURCEFLAG%%SOURCE%
-?GENERIC??!SUBDIROBJ?  %SILENT%$(am__mv) %DEPBASE%.Tpo %DEPBASE%.Po
-?GENERIC??SUBDIROBJ?   %VERBOSE%depbase=`echo %OBJ% | sed 
's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-?GENERIC??SUBDIROBJ?   %COMPILE% -MT %OBJ% -MD -MP -MF %DEPBASE%.Tpo %-c% -o 
%OBJ% %SOURCEFLAG%%SOURCE% &&\
-?GENERIC??SUBDIROBJ?   $(am__mv) %DEPBASE%.Tpo %DEPBASE%.Po
+       %VERBOSE%$(am__set_depbase) && \
+       %COMPILE% -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ %SOURCEFLAG% 
%XSOURCE% && \
+       $(am__mv) $$depbase.Tpo $$depbase.Po
 else !%FASTDEP%
 if %AMDEP%
-       %VERBOSE%source='%SOURCE%' object='%OBJ%' libtool=no @AMDEPBACKSLASH@
+       %VERBOSE%source='%SOURCE%' object='$@' libtool=no @AMDEPBACKSLASH@
        DEPDIR=$(DEPDIR) $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
 endif %AMDEP%
-if %?GENERIC%
-?-o?   %VERBOSE-NODEP%%COMPILE% %-c% %-o% %OBJ% %SOURCEFLAG%%SOURCE%
-?!-o?  %VERBOSE-NODEP%%COMPILE% %-c% %SOURCEFLAG%%SOURCE%
-else !%?GENERIC%
-## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?-o?   %VERBOSE-NODEP%%COMPILE% %-c% %-o% %OBJ% %SOURCEFLAG%`test -f 
'%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
-?!-o?  %VERBOSE-NODEP%%COMPILE% %-c% %SOURCEFLAG%`test -f '%SOURCE%' || echo 
'$(srcdir)/'`%SOURCE%
-endif !%?GENERIC%
+       %VERBOSE-NODEP%%COMPILE% -c -o $@ %SOURCEFLAG% %XSOURCE%
 endif !%FASTDEP%
 
 ?GENERIC?%EXT%.obj:
 ?!GENERIC?%OBJOBJ%: %SOURCE%
 if %FASTDEP%
-## In fast-dep mode, we can always use -o.
-## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?!GENERIC?     %VERBOSE%%COMPILE% -MT %OBJOBJ% -MD -MP -MF %DEPBASE%.Tpo %-c% 
-o %OBJOBJ% %SOURCEFLAG%`if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; 
else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi`
-?!GENERIC?     %SILENT%$(am__mv) %DEPBASE%.Tpo %DEPBASE%.Po
-?GENERIC??!SUBDIROBJ?  %VERBOSE%%COMPILE% -MT %OBJOBJ% -MD -MP -MF 
%DEPBASE%.Tpo %-c% -o %OBJOBJ% %SOURCEFLAG%`$(CYGPATH_W) '%SOURCE%'`
-?GENERIC??!SUBDIROBJ?  %SILENT%$(am__mv) %DEPBASE%.Tpo %DEPBASE%.Po
-?GENERIC??SUBDIROBJ?   %VERBOSE%depbase=`echo %OBJ% | sed 
's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-?GENERIC??SUBDIROBJ?   %COMPILE% -MT %OBJOBJ% -MD -MP -MF %DEPBASE%.Tpo %-c% 
-o %OBJOBJ% %SOURCEFLAG%`$(CYGPATH_W) '%SOURCE%'` &&\
-?GENERIC??SUBDIROBJ?   $(am__mv) %DEPBASE%.Tpo %DEPBASE%.Po
+       %VERBOSE%$(am__set_depbase) && \
+       %COMPILE% -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ %SOURCEFLAG% 
$$($(CYGPATH_W) %XSOURCE%) && \
+       $(am__mv) $$depbase.Tpo $$depbase.Po
 else !%FASTDEP%
 if %AMDEP%
-       %VERBOSE%source='%SOURCE%' object='%OBJOBJ%' libtool=no @AMDEPBACKSLASH@
+       %VERBOSE%source='%SOURCE%' object='$@' libtool=no @AMDEPBACKSLASH@
        DEPDIR=$(DEPDIR) $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
 endif %AMDEP%
-if %?GENERIC%
-?-o?   %VERBOSE-NODEP%%COMPILE% %-c% %-o% %OBJOBJ% %SOURCEFLAG%`$(CYGPATH_W) 
'%SOURCE%'`
-?!-o?  %VERBOSE-NODEP%%COMPILE% %-c% `$(CYGPATH_W) %SOURCEFLAG%'%SOURCE%'`
-else !%?GENERIC%
-## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?-o?   %VERBOSE-NODEP%%COMPILE% %-c% %-o% %OBJOBJ% %SOURCEFLAG%`if test -f 
'%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; else $(CYGPATH_W) 
'$(srcdir)/%SOURCE%'; fi`
-?!-o?  %VERBOSE-NODEP%%COMPILE% %-c% %SOURCEFLAG%`if test -f '%SOURCE%'; then 
$(CYGPATH_W) '%SOURCE%'; else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi`
-endif !%?GENERIC%
+       %VERBOSE-NODEP%%COMPILE% -c -o $@ %SOURCEFLAG% $$($(CYGPATH_W) 
%XSOURCE%)
 endif !%FASTDEP%
 endif %?NONLIBTOOL%
 
@@ -92,23 +71,14 @@ if %?LIBTOOL%
 ?GENERIC?%EXT%.lo:
 ?!GENERIC?%LTOBJ%: %SOURCE%
 if %FASTDEP%
-## In fast-dep mode, we can always use -o.
-## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?!GENERIC?     %VERBOSE%%LTCOMPILE% -MT %LTOBJ% -MD -MP -MF %DEPBASE%.Tpo %-c% 
-o %LTOBJ% %SOURCEFLAG%`test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
-?!GENERIC?     %SILENT%$(am__mv) %DEPBASE%.Tpo %DEPBASE%.Plo
-?GENERIC??!SUBDIROBJ?  %VERBOSE%%LTCOMPILE% -MT %LTOBJ% -MD -MP -MF 
%DEPBASE%.Tpo %-c% -o %LTOBJ% %SOURCEFLAG%%SOURCE%
-?GENERIC??!SUBDIROBJ?  %SILENT%$(am__mv) %DEPBASE%.Tpo %DEPBASE%.Plo
-?GENERIC??SUBDIROBJ?   %VERBOSE%depbase=`echo %OBJ% | sed 
's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-?GENERIC??SUBDIROBJ?   %LTCOMPILE% -MT %LTOBJ% -MD -MP -MF %DEPBASE%.Tpo %-c% 
-o %LTOBJ% %SOURCEFLAG%%SOURCE% &&\
-?GENERIC??SUBDIROBJ?   $(am__mv) %DEPBASE%.Tpo %DEPBASE%.Plo
+       %VERBOSE%$(am__set_depbase) && \
+       %LTCOMPILE% -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ %SOURCEFLAG% 
%XSOURCE% && \
+       $(am__mv) $$depbase.Tpo $$depbase.Plo
 else !%FASTDEP%
 if %AMDEP%
-       %VERBOSE%source='%SOURCE%' object='%LTOBJ%' libtool=yes @AMDEPBACKSLASH@
+       %VERBOSE%source='%SOURCE%' object='$@' libtool=yes @AMDEPBACKSLASH@
        DEPDIR=$(DEPDIR) $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
 endif %AMDEP%
-## We can always use '-o' with Libtool.
-?GENERIC?      %VERBOSE-NODEP%%LTCOMPILE% %-c% -o %LTOBJ% %SOURCEFLAG%%SOURCE%
-## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?!GENERIC?     %VERBOSE-NODEP%%LTCOMPILE% %-c% -o %LTOBJ% %SOURCEFLAG%`test -f 
'%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
+       %VERBOSE-NODEP%%LTCOMPILE% -c -o $@ %SOURCEFLAG% %XSOURCE%
 endif !%FASTDEP%
 endif %?LIBTOOL%
diff --git a/lib/am/lisp.am b/lib/am/lisp.am
index de9e5bb..bfb023f 100644
--- a/lib/am/lisp.am
+++ b/lib/am/lisp.am
@@ -31,13 +31,13 @@ endif %?INSTALL%
 ## input (which would erronously put it in $(srcdir) in VPATH builds),
 ## so we override that, too.
        if test "$(EMACS)" != "no"; then \
-         am__subdir_includes=''; \
+         am__dir=. am__subdir_includes=''; \
          case $@ in */*) \
            am__dir=`echo '$@' | sed 's,/[^/]*$$,,'`; \
            am__subdir_includes="-L $$am__dir -L $(srcdir)/$$am__dir"; \
          esac; \
 ## Emacs byte-compilation won't create this automatically, sadly.
-         test -d $$am__dir || $(MKDIR_P) $$am__dir || exit 1; \
+         test -d "$$am__dir" || $(MKDIR_P) "$$am__dir" || exit 1; \
          $(EMACS) --batch \
            $(AM_ELCFLAGS) $(ELCFLAGS) \
            $$am__subdir_includes -L $(builddir) -L $(srcdir) \
diff --git a/maintainer/syntax-checks.mk b/maintainer/syntax-checks.mk
index 0bd362c..f178eff 100644
--- a/maintainer/syntax-checks.mk
+++ b/maintainer/syntax-checks.mk
@@ -68,7 +68,6 @@ sc_tests_required_after_defs \
 sc_tests_overriding_macros_on_cmdline \
 sc_tests_plain_sleep \
 sc_tests_ls_t \
-sc_tests_executable \
 sc_m4_am_plain_egrep_fgrep \
 sc_tests_no_configure_in \
 sc_tests_PATH_SEPARATOR \
@@ -409,19 +408,6 @@ sc_tests_ls_t:
          exit 1; \
        fi
 
-## Test scripts must be executable.
-sc_tests_executable:
-       @st=0; \
-       for f in $(xtests); do \
-         case $$f in \
-           t/ax/*|./t/ax/*|$(srcdir)/t/ax/*);; \
-           *) test -x $$f || { echo "$$f: not executable" >&2; st=1; }; \
-         esac; \
-       done; \
-       test $$st -eq 0 || echo '$@: some test scripts are not executable' >&2; 
\
-       exit $$st;
-
-
 ## Never use 'sleep 1' to create files with different timestamps.
 ## Use '$sleep' instead.  Some filesystems (e.g., Windows) have only
 ## a 2sec resolution.
diff --git a/t/Makefile.inc b/t/Makefile.inc
index f979c66..3634a4b 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
+ 
 
 ## Will be updated later.
 TESTS =
@@ -260,15 +261,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 02cb3a5..60eb7c7 100644
--- a/t/README
+++ b/t/README
@@ -254,9 +254,9 @@ 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 <address@hidden>.
+* Add any new test to handwritten_TESTS in 't/list-of-tests.mk', and
+  to XFAIL_TESTS in addition if needed (that is, if the test is expected
+  to fail).
 
 * 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
old mode 100755
new mode 100644
diff --git a/t/aclocal-I-and-install.sh b/t/aclocal-I-and-install.sh
old mode 100755
new mode 100644
diff --git a/t/aclocal-I-order-1.sh b/t/aclocal-I-order-1.sh
old mode 100755
new mode 100644
diff --git a/t/aclocal-I-order-2.sh b/t/aclocal-I-order-2.sh
old mode 100755
new mode 100644
diff --git a/t/aclocal-I-order-3.sh b/t/aclocal-I-order-3.sh
old mode 100755
new mode 100644
diff --git a/t/aclocal-acdir.sh b/t/aclocal-acdir.sh
old mode 100755
new mode 100644
diff --git a/t/aclocal-amflags.sh b/t/aclocal-amflags.sh
old mode 100755
new mode 100644
diff --git a/t/aclocal-autoconf-version-check.sh 
b/t/aclocal-autoconf-version-check.sh
old mode 100755
new mode 100644
diff --git a/t/aclocal-comments-respected.sh b/t/aclocal-comments-respected.sh
old mode 100755
new mode 100644
diff --git a/t/aclocal-deleted-header-aclocal-amflags.sh 
b/t/aclocal-deleted-header-aclocal-amflags.sh
old mode 100755
new mode 100644
diff --git a/t/aclocal-deleted-header.sh b/t/aclocal-deleted-header.sh
old mode 100755
new mode 100644
diff --git a/t/aclocal-deps-subdir.sh b/t/aclocal-deps-subdir.sh
old mode 100755
new mode 100644
diff --git a/t/aclocal-deps.sh b/t/aclocal-deps.sh
old mode 100755
new mode 100644
diff --git a/t/aclocal-dirlist-abspath.sh b/t/aclocal-dirlist-abspath.sh
old mode 100755
new mode 100644
diff --git a/t/aclocal-dirlist-globbing.sh b/t/aclocal-dirlist-globbing.sh
old mode 100755
new mode 100644
diff --git a/t/aclocal-dirlist.sh b/t/aclocal-dirlist.sh
old mode 100755
new mode 100644
diff --git a/t/aclocal-install-absdir.sh b/t/aclocal-install-absdir.sh
old mode 100755
new mode 100644
diff --git a/t/aclocal-install-fail.sh b/t/aclocal-install-fail.sh
old mode 100755
new mode 100644
diff --git a/t/aclocal-install-mkdir.sh b/t/aclocal-install-mkdir.sh
old mode 100755
new mode 100644
diff --git a/t/aclocal-m4-include-are-scanned-aclocal-amflags.sh 
b/t/aclocal-m4-include-are-scanned-aclocal-amflags.sh
old mode 100755
new mode 100644
diff --git a/t/aclocal-m4-include-are-scanned.sh 
b/t/aclocal-m4-include-are-scanned.sh
old mode 100755
new mode 100644
diff --git a/t/aclocal-m4-sinclude.sh b/t/aclocal-m4-sinclude.sh
old mode 100755
new mode 100644
diff --git a/t/aclocal-macrodir.tap b/t/aclocal-macrodir.tap
old mode 100755
new mode 100644
index fb80609..4d11917
--- 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
old mode 100755
new mode 100644
index 0898c29..1cbf6d7
--- 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
old mode 100755
new mode 100644
diff --git a/t/aclocal-no-extra-scan.sh b/t/aclocal-no-extra-scan.sh
old mode 100755
new mode 100644
diff --git a/t/aclocal-no-force.sh b/t/aclocal-no-force.sh
old mode 100755
new mode 100644
diff --git a/t/aclocal-no-install-no-mkdir.sh b/t/aclocal-no-install-no-mkdir.sh
old mode 100755
new mode 100644
diff --git a/t/aclocal-no-symlinked-overwrite.sh 
b/t/aclocal-no-symlinked-overwrite.sh
old mode 100755
new mode 100644
diff --git a/t/aclocal-no-unused-required.sh b/t/aclocal-no-unused-required.sh
old mode 100755
new mode 100644
diff --git a/t/aclocal-path-install-serial.sh b/t/aclocal-path-install-serial.sh
old mode 100755
new mode 100644
diff --git a/t/aclocal-path-install.sh b/t/aclocal-path-install.sh
old mode 100755
new mode 100644
diff --git a/t/aclocal-path-nonexistent.sh b/t/aclocal-path-nonexistent.sh
old mode 100755
new mode 100644
diff --git a/t/aclocal-path-precedence.sh b/t/aclocal-path-precedence.sh
old mode 100755
new mode 100644
diff --git a/t/aclocal-path.sh b/t/aclocal-path.sh
old mode 100755
new mode 100644
diff --git a/t/aclocal-pr450.sh b/t/aclocal-pr450.sh
old mode 100755
new mode 100644
diff --git a/t/aclocal-print-acdir.sh b/t/aclocal-print-acdir.sh
old mode 100755
new mode 100644
diff --git a/t/aclocal-remake-misc.sh b/t/aclocal-remake-misc.sh
old mode 100755
new mode 100644
diff --git a/t/aclocal-req.sh b/t/aclocal-req.sh
old mode 100755
new mode 100644
diff --git a/t/aclocal-scan-configure-ac-pr319.sh 
b/t/aclocal-scan-configure-ac-pr319.sh
old mode 100755
new mode 100644
diff --git a/t/aclocal-serial.sh b/t/aclocal-serial.sh
old mode 100755
new mode 100644
diff --git a/t/aclocal-underquoted-defun.sh b/t/aclocal-underquoted-defun.sh
old mode 100755
new mode 100644
diff --git a/t/aclocal-verbose-install.sh b/t/aclocal-verbose-install.sh
old mode 100755
new mode 100644
diff --git a/t/aclocal.sh b/t/aclocal.sh
old mode 100755
new mode 100644
diff --git a/t/acsilent.sh b/t/acsilent.sh
old mode 100755
new mode 100644
diff --git a/t/acsubst.sh b/t/acsubst.sh
old mode 100755
new mode 100644
diff --git a/t/acsubst2.sh b/t/acsubst2.sh
old mode 100755
new mode 100644
diff --git a/t/add-missing-multiple.sh b/t/add-missing-multiple.sh
old mode 100755
new mode 100644
diff --git a/t/add-missing.tap b/t/add-missing.tap
old mode 100755
new mode 100644
diff --git a/t/all.sh b/t/all.sh
old mode 100755
new mode 100644
diff --git a/t/all2.sh b/t/all2.sh
old mode 100755
new mode 100644
diff --git a/t/alloca.sh b/t/alloca.sh
old mode 100755
new mode 100644
diff --git a/t/alloca2.sh b/t/alloca2.sh
old mode 100755
new mode 100644
diff --git a/t/alpha.sh b/t/alpha.sh
old mode 100755
new mode 100644
diff --git a/t/alpha2.sh b/t/alpha2.sh
old mode 100755
new mode 100644
diff --git a/t/am-config-header.sh b/t/am-config-header.sh
old mode 100755
new mode 100644
diff --git a/t/am-default-source-ext.sh b/t/am-default-source-ext.sh
old mode 100755
new mode 100644
diff --git a/t/am-macro-not-found.sh b/t/am-macro-not-found.sh
old mode 100755
new mode 100644
diff --git a/t/am-missing-prog.sh b/t/am-missing-prog.sh
old mode 100755
new mode 100644
diff --git a/t/am-prog-cc-c-o.sh b/t/am-prog-cc-c-o.sh
old mode 100755
new mode 100644
diff --git a/t/am-prog-cc-stdc.sh b/t/am-prog-cc-stdc.sh
old mode 100755
new mode 100644
diff --git a/t/am-prog-mkdir-p.sh b/t/am-prog-mkdir-p.sh
old mode 100755
new mode 100644
diff --git a/t/am-tests-environment.sh b/t/am-tests-environment.sh
old mode 100755
new mode 100644
diff --git a/t/amassign.sh b/t/amassign.sh
old mode 100755
new mode 100644
diff --git a/t/amhello-binpkg.sh b/t/amhello-binpkg.sh
old mode 100755
new mode 100644
diff --git a/t/amhello-cflags.sh b/t/amhello-cflags.sh
old mode 100755
new mode 100644
diff --git a/t/amhello-cross-compile.sh b/t/amhello-cross-compile.sh
old mode 100755
new mode 100644
diff --git a/t/aminit-moreargs-deprecation.sh b/t/aminit-moreargs-deprecation.sh
old mode 100755
new mode 100644
diff --git a/t/amopt.sh b/t/amopt.sh
old mode 100755
new mode 100644
diff --git a/t/amopts-location.sh b/t/amopts-location.sh
old mode 100755
new mode 100644
diff --git a/t/amopts-variable-expansion.sh b/t/amopts-variable-expansion.sh
old mode 100755
new mode 100644
diff --git a/t/amsubst.sh b/t/amsubst.sh
old mode 100755
new mode 100644
diff --git a/t/ansi2knr-no-more.sh b/t/ansi2knr-no-more.sh
old mode 100755
new mode 100644
diff --git a/t/ar-lib.sh b/t/ar-lib.sh
old mode 100755
new mode 100644
diff --git a/t/ar-lib2.sh b/t/ar-lib2.sh
old mode 100755
new mode 100644
diff --git a/t/ar-lib3.sh b/t/ar-lib3.sh
old mode 100755
new mode 100644
diff --git a/t/ar-lib4.sh b/t/ar-lib4.sh
old mode 100755
new mode 100644
diff --git a/t/ar-lib5a.sh b/t/ar-lib5a.sh
old mode 100755
new mode 100644
diff --git a/t/ar-lib5b.sh b/t/ar-lib5b.sh
old mode 100755
new mode 100644
diff --git a/t/ar-lib6a.sh b/t/ar-lib6a.sh
old mode 100755
new mode 100644
diff --git a/t/ar-lib6b.sh b/t/ar-lib6b.sh
old mode 100755
new mode 100644
diff --git a/t/ar-lib7.sh b/t/ar-lib7.sh
old mode 100755
new mode 100644
diff --git a/t/ar.sh b/t/ar.sh
old mode 100755
new mode 100644
diff --git a/t/ar2.sh b/t/ar2.sh
old mode 100755
new mode 100644
diff --git a/t/ar3.sh b/t/ar3.sh
old mode 100755
new mode 100644
diff --git a/t/ar4.sh b/t/ar4.sh
old mode 100755
new mode 100644
diff --git a/t/ar5.sh b/t/ar5.sh
old mode 100755
new mode 100644
diff --git a/t/asm.sh b/t/asm.sh
old mode 100755
new mode 100644
diff --git a/t/asm2.sh b/t/asm2.sh
old mode 100755
new mode 100644
diff --git a/t/asm3.sh b/t/asm3.sh
old mode 100755
new mode 100644
diff --git a/t/autodist-acconfig-no-subdir.sh b/t/autodist-acconfig-no-subdir.sh
old mode 100755
new mode 100644
diff --git a/t/autodist-acconfig.sh b/t/autodist-acconfig.sh
old mode 100755
new mode 100644
diff --git a/t/autodist-aclocal-m4.sh b/t/autodist-aclocal-m4.sh
old mode 100755
new mode 100644
diff --git a/t/autodist-config-headers.sh b/t/autodist-config-headers.sh
old mode 100755
new mode 100644
diff --git a/t/autodist-configure-no-subdir.sh 
b/t/autodist-configure-no-subdir.sh
old mode 100755
new mode 100644
diff --git a/t/autodist-no-duplicate.sh b/t/autodist-no-duplicate.sh
old mode 100755
new mode 100644
diff --git a/t/autodist-stamp-vti.sh b/t/autodist-stamp-vti.sh
old mode 100755
new mode 100644
diff --git a/t/autodist-subdir.sh b/t/autodist-subdir.sh
old mode 100755
new mode 100644
diff --git a/t/autodist.sh b/t/autodist.sh
old mode 100755
new mode 100644
diff --git a/t/autohdr-subdir-pr12495.sh b/t/autohdr-subdir-pr12495.sh
old mode 100755
new mode 100644
diff --git a/t/autohdr.sh b/t/autohdr.sh
old mode 100755
new mode 100644
diff --git a/t/autohdr3.sh b/t/autohdr3.sh
old mode 100755
new mode 100644
diff --git a/t/autohdr4.sh b/t/autohdr4.sh
old mode 100755
new mode 100644
diff --git a/t/autohdrdry.sh b/t/autohdrdry.sh
old mode 100755
new mode 100644
diff --git a/t/automake-cmdline.tap b/t/automake-cmdline.tap
old mode 100755
new mode 100644
diff --git a/t/auxdir-autodetect.sh b/t/auxdir-autodetect.sh
old mode 100755
new mode 100644
index 17567c0..457e06a
--- 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
old mode 100755
new mode 100644
diff --git a/t/auxdir-misplaced.sh b/t/auxdir-misplaced.sh
old mode 100755
new mode 100644
diff --git a/t/auxdir-nonexistent.sh b/t/auxdir-nonexistent.sh
old mode 100755
new mode 100644
diff --git a/t/auxdir-unportable.tap b/t/auxdir-unportable.tap
old mode 100755
new mode 100644
diff --git a/t/auxdir.sh b/t/auxdir.sh
old mode 100755
new mode 100644
diff --git a/t/auxdir6.sh b/t/auxdir6.sh
old mode 100755
new mode 100644
diff --git a/t/auxdir7.sh b/t/auxdir7.sh
old mode 100755
new mode 100644
diff --git a/t/auxdir8.sh b/t/auxdir8.sh
old mode 100755
new mode 100644
diff --git a/t/ax/am-test-lib.sh b/t/ax/am-test-lib.sh
index 91a18cc..f35ccd5 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
@@ -805,7 +797,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 0000000..7060766
--- /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 9662c79..c716cab 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 a3c16ee..ee83dcf 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.  ##
 ## ------------------------------------ ##
@@ -174,10 +191,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
old mode 100755
new mode 100644
diff --git a/t/backcompat.sh b/t/backcompat.sh
old mode 100755
new mode 100644
diff --git a/t/backcompat2.sh b/t/backcompat2.sh
old mode 100755
new mode 100644
diff --git a/t/backcompat3.sh b/t/backcompat3.sh
old mode 100755
new mode 100644
diff --git a/t/backcompat6.sh b/t/backcompat6.sh
old mode 100755
new mode 100644
diff --git a/t/backslash-before-trailing-whitespace.sh 
b/t/backslash-before-trailing-whitespace.sh
old mode 100755
new mode 100644
diff --git a/t/backslash-issues.sh b/t/backslash-issues.sh
old mode 100755
new mode 100644
diff --git a/t/badline.sh b/t/badline.sh
old mode 100755
new mode 100644
diff --git a/t/badopt.sh b/t/badopt.sh
old mode 100755
new mode 100644
diff --git a/t/badprog.sh b/t/badprog.sh
old mode 100755
new mode 100644
diff --git a/t/built-sources-check.sh b/t/built-sources-check.sh
old mode 100755
new mode 100644
diff --git a/t/built-sources-cond.sh b/t/built-sources-cond.sh
old mode 100755
new mode 100644
diff --git a/t/built-sources-fork-bomb.sh b/t/built-sources-fork-bomb.sh
old mode 100755
new mode 100644
diff --git a/t/built-sources-install.sh b/t/built-sources-install.sh
old mode 100755
new mode 100644
diff --git a/t/built-sources-subdir.sh b/t/built-sources-subdir.sh
old mode 100755
new mode 100644
diff --git a/t/built-sources.sh b/t/built-sources.sh
old mode 100755
new mode 100644
diff --git a/t/c-demo.sh b/t/c-demo.sh
old mode 100755
new mode 100644
diff --git a/t/candist.sh b/t/candist.sh
old mode 100755
new mode 100644
diff --git a/t/canon-name.sh b/t/canon-name.sh
old mode 100755
new mode 100644
diff --git a/t/canon.sh b/t/canon.sh
old mode 100755
new mode 100644
diff --git a/t/canon2.sh b/t/canon2.sh
old mode 100755
new mode 100644
diff --git a/t/canon3.sh b/t/canon3.sh
old mode 100755
new mode 100644
diff --git a/t/canon4.sh b/t/canon4.sh
old mode 100755
new mode 100644
diff --git a/t/canon5.sh b/t/canon5.sh
old mode 100755
new mode 100644
diff --git a/t/canon6.sh b/t/canon6.sh
old mode 100755
new mode 100644
diff --git a/t/canon7.sh b/t/canon7.sh
old mode 100755
new mode 100644
diff --git a/t/canon8.sh b/t/canon8.sh
old mode 100755
new mode 100644
diff --git a/t/ccnoco.sh b/t/ccnoco.sh
old mode 100755
new mode 100644
diff --git a/t/ccnoco3.sh b/t/ccnoco3.sh
old mode 100755
new mode 100644
diff --git a/t/ccnoco4.sh b/t/ccnoco4.sh
old mode 100755
new mode 100644
diff --git a/t/check-concurrency-bug9245.sh b/t/check-concurrency-bug9245.sh
old mode 100755
new mode 100644
diff --git a/t/check-exported-srcdir.sh b/t/check-exported-srcdir.sh
old mode 100755
new mode 100644
diff --git a/t/check-fd-redirect.sh b/t/check-fd-redirect.sh
old mode 100755
new mode 100644
diff --git a/t/check-no-test-driver.sh b/t/check-no-test-driver.sh
old mode 100755
new mode 100644
diff --git a/t/check-subst-prog.sh b/t/check-subst-prog.sh
old mode 100755
new mode 100644
diff --git a/t/check-subst.sh b/t/check-subst.sh
old mode 100755
new mode 100644
diff --git a/t/check-tests-in-builddir.sh b/t/check-tests-in-builddir.sh
old mode 100755
new mode 100644
index fad6527..1c41368
--- 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/check.sh b/t/check.sh
old mode 100755
new mode 100644
diff --git a/t/check10.sh b/t/check10.sh
old mode 100755
new mode 100644
diff --git a/t/check11.sh b/t/check11.sh
old mode 100755
new mode 100644
diff --git a/t/check12.sh b/t/check12.sh
old mode 100755
new mode 100644
diff --git a/t/check2.sh b/t/check2.sh
old mode 100755
new mode 100644
diff --git a/t/check4.sh b/t/check4.sh
old mode 100755
new mode 100644
diff --git a/t/check5.sh b/t/check5.sh
old mode 100755
new mode 100644
diff --git a/t/check6.sh b/t/check6.sh
old mode 100755
new mode 100644
diff --git a/t/check7.sh b/t/check7.sh
old mode 100755
new mode 100644
diff --git a/t/check8.sh b/t/check8.sh
old mode 100755
new mode 100644
diff --git a/t/checkall.sh b/t/checkall.sh
old mode 100755
new mode 100644
diff --git a/t/clean.sh b/t/clean.sh
old mode 100755
new mode 100644
diff --git a/t/colneq.sh b/t/colneq.sh
old mode 100755
new mode 100644
diff --git a/t/colneq2.sh b/t/colneq2.sh
old mode 100755
new mode 100644
diff --git a/t/colneq3.sh b/t/colneq3.sh
old mode 100755
new mode 100644
diff --git a/t/colon.sh b/t/colon.sh
old mode 100755
new mode 100644
diff --git a/t/colon2.sh b/t/colon2.sh
old mode 100755
new mode 100644
diff --git a/t/colon3.sh b/t/colon3.sh
old mode 100755
new mode 100644
diff --git a/t/colon4.sh b/t/colon4.sh
old mode 100755
new mode 100644
diff --git a/t/colon5.sh b/t/colon5.sh
old mode 100755
new mode 100644
diff --git a/t/colon6.sh b/t/colon6.sh
old mode 100755
new mode 100644
diff --git a/t/colon7.sh b/t/colon7.sh
old mode 100755
new mode 100644
diff --git a/t/color-tests-opt.sh b/t/color-tests-opt.sh
old mode 100755
new mode 100644
diff --git a/t/color-tests.sh b/t/color-tests.sh
old mode 100755
new mode 100644
diff --git a/t/color-tests2.sh b/t/color-tests2.sh
old mode 100755
new mode 100644
diff --git a/t/commen10.sh b/t/commen10.sh
old mode 100755
new mode 100644
diff --git a/t/commen11.sh b/t/commen11.sh
old mode 100755
new mode 100644
diff --git a/t/comment-block.sh b/t/comment-block.sh
old mode 100755
new mode 100644
diff --git a/t/comment.sh b/t/comment.sh
old mode 100755
new mode 100644
diff --git a/t/comment2.sh b/t/comment2.sh
old mode 100755
new mode 100644
diff --git a/t/comment3.sh b/t/comment3.sh
old mode 100755
new mode 100644
diff --git a/t/comment4.sh b/t/comment4.sh
old mode 100755
new mode 100644
diff --git a/t/comment5.sh b/t/comment5.sh
old mode 100755
new mode 100644
diff --git a/t/comment6.sh b/t/comment6.sh
old mode 100755
new mode 100644
diff --git a/t/comment7.sh b/t/comment7.sh
old mode 100755
new mode 100644
diff --git a/t/comment8.sh b/t/comment8.sh
old mode 100755
new mode 100644
diff --git a/t/comment9.sh b/t/comment9.sh
old mode 100755
new mode 100644
diff --git a/t/comments-in-var-def.sh b/t/comments-in-var-def.sh
old mode 100755
new mode 100644
diff --git a/t/compile.sh b/t/compile.sh
old mode 100755
new mode 100644
diff --git a/t/compile2.sh b/t/compile2.sh
old mode 100755
new mode 100644
diff --git a/t/compile3.sh b/t/compile3.sh
old mode 100755
new mode 100644
diff --git a/t/compile4.sh b/t/compile4.sh
old mode 100755
new mode 100644
diff --git a/t/compile5.sh b/t/compile5.sh
old mode 100755
new mode 100644
diff --git a/t/compile6.sh b/t/compile6.sh
old mode 100755
new mode 100644
diff --git a/t/compile_f90_c_cxx.sh b/t/compile_f90_c_cxx.sh
old mode 100755
new mode 100644
diff --git a/t/compile_f_c_cxx.sh b/t/compile_f_c_cxx.sh
old mode 100755
new mode 100644
index a0b0e21..4b9189d
--- 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
old mode 100755
new mode 100644
diff --git a/t/cond.sh b/t/cond.sh
old mode 100755
new mode 100644
diff --git a/t/cond10.sh b/t/cond10.sh
old mode 100755
new mode 100644
diff --git a/t/cond11.sh b/t/cond11.sh
old mode 100755
new mode 100644
diff --git a/t/cond13.sh b/t/cond13.sh
old mode 100755
new mode 100644
diff --git a/t/cond14.sh b/t/cond14.sh
old mode 100755
new mode 100644
diff --git a/t/cond15.sh b/t/cond15.sh
old mode 100755
new mode 100644
diff --git a/t/cond16.sh b/t/cond16.sh
old mode 100755
new mode 100644
diff --git a/t/cond17.sh b/t/cond17.sh
old mode 100755
new mode 100644
diff --git a/t/cond18.sh b/t/cond18.sh
old mode 100755
new mode 100644
diff --git a/t/cond19.sh b/t/cond19.sh
old mode 100755
new mode 100644
diff --git a/t/cond20.sh b/t/cond20.sh
old mode 100755
new mode 100644
diff --git a/t/cond21.sh b/t/cond21.sh
old mode 100755
new mode 100644
diff --git a/t/cond22.sh b/t/cond22.sh
old mode 100755
new mode 100644
diff --git a/t/cond23.sh b/t/cond23.sh
old mode 100755
new mode 100644
diff --git a/t/cond24.sh b/t/cond24.sh
old mode 100755
new mode 100644
diff --git a/t/cond25.sh b/t/cond25.sh
old mode 100755
new mode 100644
diff --git a/t/cond26.sh b/t/cond26.sh
old mode 100755
new mode 100644
diff --git a/t/cond27.sh b/t/cond27.sh
old mode 100755
new mode 100644
diff --git a/t/cond28.sh b/t/cond28.sh
old mode 100755
new mode 100644
diff --git a/t/cond3.sh b/t/cond3.sh
old mode 100755
new mode 100644
diff --git a/t/cond30.sh b/t/cond30.sh
old mode 100755
new mode 100644
diff --git a/t/cond31.sh b/t/cond31.sh
old mode 100755
new mode 100644
diff --git a/t/cond32.sh b/t/cond32.sh
old mode 100755
new mode 100644
diff --git a/t/cond33.sh b/t/cond33.sh
old mode 100755
new mode 100644
diff --git a/t/cond34.sh b/t/cond34.sh
old mode 100755
new mode 100644
diff --git a/t/cond35.sh b/t/cond35.sh
old mode 100755
new mode 100644
diff --git a/t/cond36.sh b/t/cond36.sh
old mode 100755
new mode 100644
diff --git a/t/cond37.sh b/t/cond37.sh
old mode 100755
new mode 100644
diff --git a/t/cond38.sh b/t/cond38.sh
old mode 100755
new mode 100644
diff --git a/t/cond39.sh b/t/cond39.sh
old mode 100755
new mode 100644
diff --git a/t/cond4.sh b/t/cond4.sh
old mode 100755
new mode 100644
diff --git a/t/cond40.sh b/t/cond40.sh
old mode 100755
new mode 100644
diff --git a/t/cond41.sh b/t/cond41.sh
old mode 100755
new mode 100644
diff --git a/t/cond42.sh b/t/cond42.sh
old mode 100755
new mode 100644
diff --git a/t/cond43.sh b/t/cond43.sh
old mode 100755
new mode 100644
diff --git a/t/cond44.sh b/t/cond44.sh
old mode 100755
new mode 100644
diff --git a/t/cond45.sh b/t/cond45.sh
old mode 100755
new mode 100644
diff --git a/t/cond46.sh b/t/cond46.sh
old mode 100755
new mode 100644
diff --git a/t/cond5.sh b/t/cond5.sh
old mode 100755
new mode 100644
diff --git a/t/cond6.sh b/t/cond6.sh
old mode 100755
new mode 100644
diff --git a/t/cond7.sh b/t/cond7.sh
old mode 100755
new mode 100644
diff --git a/t/cond8.sh b/t/cond8.sh
old mode 100755
new mode 100644
diff --git a/t/cond9.sh b/t/cond9.sh
old mode 100755
new mode 100644
diff --git a/t/condd.sh b/t/condd.sh
old mode 100755
new mode 100644
diff --git a/t/condhook.sh b/t/condhook.sh
old mode 100755
new mode 100644
diff --git a/t/condhook2.sh b/t/condhook2.sh
old mode 100755
new mode 100644
diff --git a/t/condinc.sh b/t/condinc.sh
old mode 100755
new mode 100644
diff --git a/t/condinc2.sh b/t/condinc2.sh
old mode 100755
new mode 100644
diff --git a/t/condlib.sh b/t/condlib.sh
old mode 100755
new mode 100644
diff --git a/t/condman2.sh b/t/condman2.sh
old mode 100755
new mode 100644
diff --git a/t/condman3.sh b/t/condman3.sh
old mode 100755
new mode 100644
diff --git a/t/confdeps.sh b/t/confdeps.sh
old mode 100755
new mode 100644
diff --git a/t/conff.sh b/t/conff.sh
old mode 100755
new mode 100644
diff --git a/t/conff2.sh b/t/conff2.sh
old mode 100755
new mode 100644
diff --git a/t/conffile-leading-dot.sh b/t/conffile-leading-dot.sh
old mode 100755
new mode 100644
diff --git a/t/confh-subdir-clean.sh b/t/confh-subdir-clean.sh
old mode 100755
new mode 100644
diff --git a/t/confh.sh b/t/confh.sh
old mode 100755
new mode 100644
diff --git a/t/confh4.sh b/t/confh4.sh
old mode 100755
new mode 100644
diff --git a/t/confh5.sh b/t/confh5.sh
old mode 100755
new mode 100644
diff --git a/t/confh6.sh b/t/confh6.sh
old mode 100755
new mode 100644
diff --git a/t/confh7.sh b/t/confh7.sh
old mode 100755
new mode 100644
diff --git a/t/confh8.sh b/t/confh8.sh
old mode 100755
new mode 100644
diff --git a/t/confincl.sh b/t/confincl.sh
old mode 100755
new mode 100644
diff --git a/t/conflnk.sh b/t/conflnk.sh
old mode 100755
new mode 100644
diff --git a/t/conflnk2.sh b/t/conflnk2.sh
old mode 100755
new mode 100644
diff --git a/t/conflnk3.sh b/t/conflnk3.sh
old mode 100755
new mode 100644
diff --git a/t/conflnk4.sh b/t/conflnk4.sh
old mode 100755
new mode 100644
diff --git a/t/confsub.sh b/t/confsub.sh
old mode 100755
new mode 100644
diff --git a/t/confvar.sh b/t/confvar.sh
old mode 100755
new mode 100644
diff --git a/t/confvar2.sh b/t/confvar2.sh
old mode 100755
new mode 100644
diff --git a/t/copy.sh b/t/copy.sh
old mode 100755
new mode 100644
diff --git a/t/cscope.tap b/t/cscope.tap
old mode 100755
new mode 100644
index 9dbe01b..29feec2
--- 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
old mode 100755
new mode 100644
diff --git a/t/cscope3.sh b/t/cscope3.sh
old mode 100755
new mode 100644
diff --git a/t/cxx-demo.sh b/t/cxx-demo.sh
old mode 100755
new mode 100644
diff --git a/t/cxx-lt-demo.sh b/t/cxx-lt-demo.sh
old mode 100755
new mode 100644
diff --git a/t/cxx.sh b/t/cxx.sh
old mode 100755
new mode 100644
diff --git a/t/cxx2.sh b/t/cxx2.sh
old mode 100755
new mode 100644
diff --git a/t/cxxcpp.sh b/t/cxxcpp.sh
old mode 100755
new mode 100644
diff --git a/t/cxxlibobj.sh b/t/cxxlibobj.sh
old mode 100755
new mode 100644
diff --git a/t/cxxlink.sh b/t/cxxlink.sh
old mode 100755
new mode 100644
diff --git a/t/cxxnoc.sh b/t/cxxnoc.sh
old mode 100755
new mode 100644
diff --git a/t/cygnus-no-more.sh b/t/cygnus-no-more.sh
old mode 100755
new mode 100644
diff --git a/t/cygwin32.sh b/t/cygwin32.sh
old mode 100755
new mode 100644
diff --git a/t/dash.sh b/t/dash.sh
old mode 100755
new mode 100644
diff --git a/t/defun.sh b/t/defun.sh
old mode 100755
new mode 100644
diff --git a/t/defun2.sh b/t/defun2.sh
old mode 100755
new mode 100644
diff --git a/t/dejagnu-absolute-builddir.sh b/t/dejagnu-absolute-builddir.sh
old mode 100755
new mode 100644
diff --git a/t/dejagnu-relative-srcdir.sh b/t/dejagnu-relative-srcdir.sh
old mode 100755
new mode 100644
diff --git a/t/dejagnu-siteexp-append.sh b/t/dejagnu-siteexp-append.sh
old mode 100755
new mode 100644
diff --git a/t/dejagnu-siteexp-extend.sh b/t/dejagnu-siteexp-extend.sh
old mode 100755
new mode 100644
diff --git a/t/dejagnu-siteexp-useredit.sh b/t/dejagnu-siteexp-useredit.sh
old mode 100755
new mode 100644
diff --git a/t/dejagnu.sh b/t/dejagnu.sh
old mode 100755
new mode 100644
diff --git a/t/dejagnu2.sh b/t/dejagnu2.sh
old mode 100755
new mode 100644
diff --git a/t/dejagnu3.sh b/t/dejagnu3.sh
old mode 100755
new mode 100644
diff --git a/t/dejagnu4.sh b/t/dejagnu4.sh
old mode 100755
new mode 100644
diff --git a/t/dejagnu5.sh b/t/dejagnu5.sh
old mode 100755
new mode 100644
diff --git a/t/dejagnu6.sh b/t/dejagnu6.sh
old mode 100755
new mode 100644
diff --git a/t/dejagnu7.sh b/t/dejagnu7.sh
old mode 100755
new mode 100644
diff --git a/t/deleted-am.sh b/t/deleted-am.sh
old mode 100755
new mode 100644
diff --git a/t/deleted-m4.sh b/t/deleted-m4.sh
old mode 100755
new mode 100644
diff --git a/t/depacl2.sh b/t/depacl2.sh
old mode 100755
new mode 100644
diff --git a/t/depcomp-implicit-auxdir.sh b/t/depcomp-implicit-auxdir.sh
old mode 100755
new mode 100644
diff --git a/t/depcomp.sh b/t/depcomp.sh
old mode 100755
new mode 100644
diff --git a/t/depcomp2.sh b/t/depcomp2.sh
old mode 100755
new mode 100644
diff --git a/t/depcomp8a.sh b/t/depcomp8a.sh
old mode 100755
new mode 100644
index d6c73ed..4cb545b
--- a/t/depcomp8a.sh
+++ b/t/depcomp8a.sh
@@ -53,24 +53,7 @@ $ACLOCAL
 $AUTOMAKE -a -Wno-unsupported
 grep include Makefile.in # For debugging.
 grep 'include.*\./\$(DEPDIR)/foo\.P' Makefile.in
-grep 'include.*\./\$(DEPDIR)/bar\.P' Makefile.in
-grep 'include.*/\./\$(DEPDIR)' Makefile.in && exit 1
-
-$AUTOCONF
-# Don't reject slower dependency extractors, for better coverage.
-./configure --enable-dependency-tracking
-$MAKE
-cross_compiling || ./zardoz
-DISTCHECK_CONFIGURE_FLAGS='--enable-dependency-tracking' $MAKE distcheck
-
-# Try again with subdir-objects option.
-
-echo AUTOMAKE_OPTIONS = subdir-objects >> Makefile.am
-
-$AUTOMAKE
-grep include Makefile.in # For debugging.
-grep 'include.*\./\$(DEPDIR)/foo\.P' Makefile.in
-grep 'include.*[^a-zA-Z0-9_/]sub/\$(DEPDIR)/bar\.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
 
 $AUTOCONF
diff --git a/t/depcomp8b.sh b/t/depcomp8b.sh
old mode 100755
new mode 100644
index 879ee1c..c06c3c1
--- a/t/depcomp8b.sh
+++ b/t/depcomp8b.sh
@@ -24,16 +24,12 @@ required='cc libtoolize'
 
 cat >> configure.ac << 'END'
 AC_PROG_CC
-#x AM_PROG_CC_C_O
 AM_PROG_AR
 AC_PROG_LIBTOOL
 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
@@ -45,28 +41,9 @@ echo 'int bar (void) { return 0; }' > sub/bar.c
 libtoolize
 
 $ACLOCAL
-# FIXME: stop disabling the warnings in the 'unsupported' category
-# FIXME: once the 'subdir-objects' option has been mandatory.
-$AUTOMAKE -a -Wno-unsupported
+$AUTOMAKE -a
 grep include Makefile.in # For debugging.
-grep 'include.*\./\$(DEPDIR)/foo\.P' Makefile.in
-grep 'include.*\./\$(DEPDIR)/bar\.P' Makefile.in
-grep 'include.*/\./\$(DEPDIR)' Makefile.in && exit 1
-
-$AUTOCONF
-# Don't reject slower dependency extractors, for better coverage.
-./configure --enable-dependency-tracking
-$MAKE
-DISTCHECK_CONFIGURE_FLAGS='--enable-dependency-tracking' $MAKE distcheck
-
-# Try again with subdir-objects option.
-
-echo AUTOMAKE_OPTIONS += subdir-objects >> Makefile.am
-
-$AUTOMAKE
-grep include Makefile.in # For debugging.
-grep 'include.*\./\$(DEPDIR)/foo\.P' Makefile.in
-grep 'include.*[^a-zA-Z0-9_/]sub/\$(DEPDIR)/bar\.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
 
 $AUTOCONF
diff --git a/t/depdist.sh b/t/depdist.sh
old mode 100755
new mode 100644
diff --git a/t/depend.sh b/t/depend.sh
old mode 100755
new mode 100644
diff --git a/t/depend3.sh b/t/depend3.sh
old mode 100755
new mode 100644
diff --git a/t/depend4.sh b/t/depend4.sh
old mode 100755
new mode 100644
diff --git a/t/depend5.sh b/t/depend5.sh
old mode 100755
new mode 100644
diff --git a/t/depend6.sh b/t/depend6.sh
old mode 100755
new mode 100644
diff --git a/t/deprecated-acinit.sh b/t/deprecated-acinit.sh
old mode 100755
new mode 100644
diff --git a/t/destdir.sh b/t/destdir.sh
old mode 100755
new mode 100644
diff --git a/t/dir-named-obj-is-bad.sh b/t/dir-named-obj-is-bad.sh
old mode 100755
new mode 100644
diff --git a/t/discover.sh b/t/discover.sh
old mode 100755
new mode 100644
diff --git a/t/dist-auxdir-many-subdirs.sh b/t/dist-auxdir-many-subdirs.sh
old mode 100755
new mode 100644
diff --git a/t/dist-auxfile-2.sh b/t/dist-auxfile-2.sh
old mode 100755
new mode 100644
diff --git a/t/dist-auxfile.sh b/t/dist-auxfile.sh
old mode 100755
new mode 100644
diff --git a/t/dist-formats.tap b/t/dist-formats.tap
old mode 100755
new mode 100644
index bebac37..49281d9
--- a/t/dist-formats.tap
+++ b/t/dist-formats.tap
@@ -28,7 +28,7 @@ plan_ 66
 
 ocwd=$(pwd) || fatal_ "getting current working directory"
 
-TAR='' && unset TAR
+unset TAR
 
 # Create common aclocal.m4 file, for later tests.
 mkdir setup \
diff --git a/t/dist-included-parent-dir.sh b/t/dist-included-parent-dir.sh
old mode 100755
new mode 100644
diff --git a/t/dist-lzma.sh b/t/dist-lzma.sh
old mode 100755
new mode 100644
diff --git a/t/dist-missing-am.sh b/t/dist-missing-am.sh
old mode 100755
new mode 100644
diff --git a/t/dist-missing-included-m4.sh b/t/dist-missing-included-m4.sh
old mode 100755
new mode 100644
diff --git a/t/dist-missing-m4.sh b/t/dist-missing-m4.sh
old mode 100755
new mode 100644
diff --git a/t/dist-pr109765.sh b/t/dist-pr109765.sh
old mode 100755
new mode 100644
diff --git a/t/dist-readonly.sh b/t/dist-readonly.sh
old mode 100755
new mode 100644
diff --git a/t/dist-repeated.sh b/t/dist-repeated.sh
old mode 100755
new mode 100644
diff --git a/t/dist-shar.sh b/t/dist-shar.sh
old mode 100755
new mode 100644
diff --git a/t/dist-tarZ.sh b/t/dist-tarZ.sh
old mode 100755
new mode 100644
diff --git a/t/distcheck-configure-flags-am.sh 
b/t/distcheck-configure-flags-am.sh
old mode 100755
new mode 100644
index f38b1dc..b1fd49b
--- 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
old mode 100755
new mode 100644
diff --git a/t/distcheck-configure-flags.sh b/t/distcheck-configure-flags.sh
old mode 100755
new mode 100644
index b1725f2..3c23117
--- 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
old mode 100755
new mode 100644
diff --git a/t/distcheck-hook2.sh b/t/distcheck-hook2.sh
old mode 100755
new mode 100644
diff --git a/t/distcheck-missing-m4.sh b/t/distcheck-missing-m4.sh
old mode 100755
new mode 100644
diff --git a/t/distcheck-outdated-m4.sh b/t/distcheck-outdated-m4.sh
old mode 100755
new mode 100644
diff --git a/t/distcheck-override-infodir.sh b/t/distcheck-override-infodir.sh
old mode 100755
new mode 100644
diff --git a/t/distcheck-pr10470.sh b/t/distcheck-pr10470.sh
old mode 100755
new mode 100644
diff --git a/t/distcheck-pr9579.sh b/t/distcheck-pr9579.sh
old mode 100755
new mode 100644
diff --git a/t/distcheck-writable-srcdir.sh b/t/distcheck-writable-srcdir.sh
old mode 100755
new mode 100644
diff --git a/t/distcleancheck.sh b/t/distcleancheck.sh
old mode 100755
new mode 100644
diff --git a/t/distcom-subdir.sh b/t/distcom-subdir.sh
old mode 100755
new mode 100644
diff --git a/t/distcom2.sh b/t/distcom2.sh
old mode 100755
new mode 100644
diff --git a/t/distcom3.sh b/t/distcom3.sh
old mode 100755
new mode 100644
diff --git a/t/distcom4.sh b/t/distcom4.sh
old mode 100755
new mode 100644
diff --git a/t/distcom5.sh b/t/distcom5.sh
old mode 100755
new mode 100644
diff --git a/t/distdir.sh b/t/distdir.sh
old mode 100755
new mode 100644
diff --git a/t/disthook.sh b/t/disthook.sh
old mode 100755
new mode 100644
diff --git a/t/distlinks.sh b/t/distlinks.sh
old mode 100755
new mode 100644
diff --git a/t/distlinksbrk.sh b/t/distlinksbrk.sh
old mode 100755
new mode 100644
diff --git a/t/distname.sh b/t/distname.sh
old mode 100755
new mode 100644
diff --git a/t/dmalloc.sh b/t/dmalloc.sh
old mode 100755
new mode 100644
diff --git a/t/doc-parsing-buglets-colneq-subst.sh 
b/t/doc-parsing-buglets-colneq-subst.sh
old mode 100755
new mode 100644
diff --git a/t/doc-parsing-buglets-tabs.sh b/t/doc-parsing-buglets-tabs.sh
old mode 100755
new mode 100644
diff --git a/t/dollar.sh b/t/dollar.sh
old mode 100755
new mode 100644
diff --git a/t/dollarvar.sh b/t/dollarvar.sh
old mode 100755
new mode 100644
diff --git a/t/dollarvar2.sh b/t/dollarvar2.sh
old mode 100755
new mode 100644
diff --git a/t/double.sh b/t/double.sh
old mode 100755
new mode 100644
diff --git a/t/dup2.sh b/t/dup2.sh
old mode 100755
new mode 100644
diff --git a/t/else.sh b/t/else.sh
old mode 100755
new mode 100644
diff --git a/t/empty-data-primary.sh b/t/empty-data-primary.sh
old mode 100755
new mode 100644
diff --git a/t/empty-sources-primary.tap b/t/empty-sources-primary.tap
old mode 100755
new mode 100644
diff --git a/t/exdir.sh b/t/exdir.sh
old mode 100755
new mode 100644
diff --git a/t/exdir2.sh b/t/exdir2.sh
old mode 100755
new mode 100644
diff --git a/t/exdir3.sh b/t/exdir3.sh
old mode 100755
new mode 100644
diff --git a/t/exeext.sh b/t/exeext.sh
old mode 100755
new mode 100644
diff --git a/t/exeext2.sh b/t/exeext2.sh
old mode 100755
new mode 100644
diff --git a/t/exeext3.sh b/t/exeext3.sh
old mode 100755
new mode 100644
diff --git a/t/exeext4.sh b/t/exeext4.sh
old mode 100755
new mode 100644
diff --git a/t/exsource.sh b/t/exsource.sh
old mode 100755
new mode 100644
diff --git a/t/ext.sh b/t/ext.sh
old mode 100755
new mode 100644
diff --git a/t/ext2.sh b/t/ext2.sh
old mode 100755
new mode 100644
diff --git a/t/ext3.sh b/t/ext3.sh
old mode 100755
new mode 100644
diff --git a/t/extra-data.sh b/t/extra-data.sh
old mode 100755
new mode 100644
diff --git a/t/extra-deps-lt.sh b/t/extra-deps-lt.sh
old mode 100755
new mode 100644
diff --git a/t/extra-deps.sh b/t/extra-deps.sh
old mode 100755
new mode 100644
diff --git a/t/extra-dist-dirs-and-subdirs.sh b/t/extra-dist-dirs-and-subdirs.sh
old mode 100755
new mode 100644
diff --git a/t/extra-dist-vpath-dir-merge.sh b/t/extra-dist-vpath-dir-merge.sh
old mode 100755
new mode 100644
diff --git a/t/extra-dist-vpath-dir.sh b/t/extra-dist-vpath-dir.sh
old mode 100755
new mode 100644
diff --git a/t/extra-dist-wildcards-gnu.sh b/t/extra-dist-wildcards-gnu.sh
old mode 100755
new mode 100644
diff --git a/t/extra-dist-wildcards-vpath.sh b/t/extra-dist-wildcards-vpath.sh
old mode 100755
new mode 100644
diff --git a/t/extra-dist-wildcards.sh b/t/extra-dist-wildcards.sh
old mode 100755
new mode 100644
diff --git a/t/extra-portability.sh b/t/extra-portability.sh
old mode 100755
new mode 100644
diff --git a/t/extra-portability2.sh b/t/extra-portability2.sh
old mode 100755
new mode 100644
diff --git a/t/extra-portability3.sh b/t/extra-portability3.sh
old mode 100755
new mode 100644
diff --git a/t/extra-programs-and-libs.sh b/t/extra-programs-and-libs.sh
old mode 100755
new mode 100644
diff --git a/t/extra-programs-empty.sh b/t/extra-programs-empty.sh
old mode 100755
new mode 100644
diff --git a/t/extra-programs-misc.sh b/t/extra-programs-misc.sh
old mode 100755
new mode 100644
diff --git a/t/extra.sh b/t/extra.sh
old mode 100755
new mode 100644
diff --git a/t/extra2.sh b/t/extra2.sh
old mode 100755
new mode 100644
diff --git a/t/f90only.sh b/t/f90only.sh
old mode 100755
new mode 100644
diff --git a/t/flavor.sh b/t/flavor.sh
old mode 100755
new mode 100644
diff --git a/t/flibs.sh b/t/flibs.sh
old mode 100755
new mode 100644
diff --git a/t/fn99.sh b/t/fn99.sh
old mode 100755
new mode 100644
diff --git a/t/fn99subdir.sh b/t/fn99subdir.sh
old mode 100755
new mode 100644
diff --git a/t/fnoc.sh b/t/fnoc.sh
old mode 100755
new mode 100644
diff --git a/t/fonly.sh b/t/fonly.sh
old mode 100755
new mode 100644
diff --git a/t/forcemiss.sh b/t/forcemiss.sh
old mode 100755
new mode 100644
diff --git a/t/forcemiss2.sh b/t/forcemiss2.sh
old mode 100755
new mode 100644
diff --git a/t/fort1.sh b/t/fort1.sh
old mode 100755
new mode 100644
diff --git a/t/fort2.sh b/t/fort2.sh
old mode 100755
new mode 100644
index d614452..bed0323
--- a/t/fort2.sh
+++ b/t/fort2.sh
@@ -70,8 +70,17 @@ $MAKE -n \
   address@hidden address@hidden address@hidden address@hidden \
   > 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 .* address@hidden .* hello\.f90 ' out
diff --git a/t/fort4.sh b/t/fort4.sh
old mode 100755
new mode 100644
index 2ef27ab..2d01ee4
--- a/t/fort4.sh
+++ b/t/fort4.sh
@@ -34,6 +34,7 @@ END
 cat >bye.f90 <<'END'
 program goodbye
   call baz
+  call zar
   stop
 end
 END
@@ -46,6 +47,7 @@ END
 
 sed s,foo,bar, foo.f90 > sub/bar.f90
 sed s,foo,baz, foo.f90 > sub/baz.f
+sed s,foo,zar, foo.f90 > sub/zardoz.f90
 
 cat >>configure.ac <<'END'
 AC_PROG_F77
@@ -59,9 +61,29 @@ END
 cat >Makefile.am <<'END'
 bin_PROGRAMS = hello goodbye
 hello_SOURCES = hello.f foo.f90 sub/bar.f90
-goodbye_SOURCES = bye.f90 sub/baz.f
+goodbye_SOURCES = bye.f90 sub/baz.f sub/zardoz.f90
 goodbye_FCFLAGS =
 LDADD = $(FCLIBS)
+
+.PHONY: test-obj
+test-obj:
+       ls -l . sub # For debugging.
+       test -f hello.$(OBJEXT)
+       test -f foo.$(OBJEXT)
+       test -f sub/bar.$(OBJEXT)
+       test ! -f bar.$(OBJEXT)
+       test -f goodbye-bye.$(OBJEXT)
+       test ! -f bye.$(OBJEXT)
+       test -f sub/goodbye-zardoz.$(OBJEXT)
+       test ! -f sub/zardoz.$(OBJEXT)
+       test ! -f goodbye-zardoz.$(OBJEXT)
+       test ! -f zardoz.$(OBJEXT)
+## The setting of FCFLAGS should only cause objects deriving from
+## Fortran 90, not Fortran 77, to be renamed.
+       test -f sub/baz.$(OBJEXT)
+       test ! -f sub/goodbye-baz.$(OBJEXT)
+       test ! -f goodbye-baz.$(OBJEXT)
+       test ! -f baz.$(OBJEXT)
 END
 
 $ACLOCAL
@@ -73,22 +95,9 @@ $AUTOCONF
 # ./configure may exit with status 77 if no compiler is found,
 # or if the compiler cannot compile Fortran 90 files).
 ./configure
-$MAKE
-subobjs=$(echo sub/*.o sub/*.obj)
-test "$subobjs" = 'sub/*.o sub/*.obj'
-$MAKE distcheck
 
-$MAKE distclean
-echo 'AUTOMAKE_OPTIONS = subdir-objects' >> Makefile.am
-$AUTOMAKE
-./configure
 $MAKE
-test ! -e bar.o
-test ! -e bar.obj
-test ! -e baz.o
-test ! -e baz.obj
-test ! -e goodbye-baz.o
-test ! -e goodbye-baz.obj
+$MAKE test-obj
 $MAKE distcheck
 
 :
diff --git a/t/fort5.sh b/t/fort5.sh
old mode 100755
new mode 100644
index 7b9991b..d090f6f
--- a/t/fort5.sh
+++ b/t/fort5.sh
@@ -90,20 +90,17 @@ grep " --tag=FC" Makefile.in
 # ./configure may exit with status 77 if no compiler is found,
 # or if the compiler cannot compile Fortran 90 files).
 ./configure
-$MAKE
-subobjs=$(echo sub/*.lo)
-test "$subobjs" = 'sub/*.lo'
-$MAKE distcheck
 
-# The following will be fixed in a later patch:
-$MAKE distclean
-echo 'AUTOMAKE_OPTIONS = subdir-objects' >> Makefile.am
-$AUTOMAKE -a
-./configure
 $MAKE
+test -f sub/bar.lo
 test ! -e bar.lo
+## The setting of FCFLAGS should only cause objects deriving from
+## Fortran 90, not Fortran 77, to be renamed.
+test -f sub/baz.lo
 test ! -e baz.lo
+test ! -e sub/libgoodbye_la-baz.lo
 test ! -e libgoodbye_la-baz.lo
+
 $MAKE distcheck
 
 :
diff --git a/t/fortdep.sh b/t/fortdep.sh
old mode 100755
new mode 100644
diff --git a/t/gcj.sh b/t/gcj.sh
old mode 100755
new mode 100644
index 3de2953..3b058a5
--- a/t/gcj.sh
+++ b/t/gcj.sh
@@ -16,21 +16,50 @@
 
 # Test of compiled java.
 
+required='gcc gcj'
 . test-init.sh
 
 cat >> configure.ac << 'END'
-_AM_DEPENDENCIES([GCJ])
-AC_SUBST([GCJ])
+# FIXME: AM_PROG_GCJ should cause OBJEXT and EXEEXT to be set, but
+# FIXME: it currently does not.  See also xfailing test 'gcj6.sh'.
+AC_PROG_CC
+AM_PROG_GCJ
+AC_OUTPUT
 END
 
 cat > Makefile.am << 'END'
 bin_PROGRAMS = convert
-convert_SOURCES = x/y/convert.java
+convert_SOURCES = $(my_java_source)
+convert_LDFLAGS = --main=convert
+my_java_source = x/y/convert.java
+$(my_java_source):
+       rm -f address@hidden $@
+       test -d $(@D) || $(MKDIR_P) $(@D)
+       echo 'public class convert {'                      >> address@hidden
+       echo '  public static void main (String[] args) {' >> address@hidden
+       echo '    System.out.println("Hello, World!");'    >> address@hidden
+       echo '  }'                                         >> address@hidden
+       echo '}'                                           >> address@hidden
+       chmod a-w address@hidden && mv -f address@hidden $@
+.PHONY: test-obj
+check-local: test-obj
+test-obj:
+       test -f x/y/convert.$(OBJEXT)
 END
 
 $ACLOCAL
 $AUTOMAKE
+$FGREP 'x/y/convert.$(OBJEXT)' Makefile.in
 
-grep '^x/y/convert' Makefile.in
+$AUTOCONF
+./configure
+
+$MAKE
+$MAKE test-obj
+if ! cross_compiling; then
+  ./convert
+  test "$(./convert)" = 'Hello, World!'
+fi
+$MAKE distcheck
 
 :
diff --git a/t/gcj2.sh b/t/gcj2.sh
old mode 100755
new mode 100644
diff --git a/t/gcj3.sh b/t/gcj3.sh
old mode 100755
new mode 100644
diff --git a/t/gcj4.sh b/t/gcj4.sh
old mode 100755
new mode 100644
diff --git a/t/gcj5.sh b/t/gcj5.sh
old mode 100755
new mode 100644
diff --git a/t/gcj6.sh b/t/gcj6.sh
old mode 100755
new mode 100644
diff --git a/t/get-sysconf.sh b/t/get-sysconf.sh
old mode 100755
new mode 100644
diff --git a/t/gettext-macros.sh b/t/gettext-macros.sh
old mode 100755
new mode 100644
diff --git a/t/gettext.sh b/t/gettext.sh
old mode 100755
new mode 100644
diff --git a/t/gettext2.sh b/t/gettext2.sh
old mode 100755
new mode 100644
diff --git a/t/gettext3.sh b/t/gettext3.sh
old mode 100755
new mode 100644
diff --git a/t/gnits.sh b/t/gnits.sh
old mode 100755
new mode 100644
diff --git a/t/gnits2.sh b/t/gnits2.sh
old mode 100755
new mode 100644
diff --git a/t/gnits3.sh b/t/gnits3.sh
old mode 100755
new mode 100644
diff --git a/t/gnumake.sh b/t/gnumake.sh
old mode 100755
new mode 100644
diff --git a/t/gnuwarn.sh b/t/gnuwarn.sh
old mode 100755
new mode 100644
diff --git a/t/gnuwarn2.sh b/t/gnuwarn2.sh
old mode 100755
new mode 100644
diff --git a/t/hdr-vars-defined-once.sh b/t/hdr-vars-defined-once.sh
old mode 100755
new mode 100644
diff --git a/t/header.sh b/t/header.sh
old mode 100755
new mode 100644
diff --git a/t/help-depend.sh b/t/help-depend.sh
old mode 100755
new mode 100644
diff --git a/t/help-depend2.sh b/t/help-depend2.sh
old mode 100755
new mode 100644
diff --git a/t/help-dmalloc.sh b/t/help-dmalloc.sh
old mode 100755
new mode 100644
diff --git a/t/help-init.sh b/t/help-init.sh
old mode 100755
new mode 100644
diff --git a/t/help-lispdir.sh b/t/help-lispdir.sh
old mode 100755
new mode 100644
diff --git a/t/help-python.sh b/t/help-python.sh
old mode 100755
new mode 100644
diff --git a/t/help-silent.sh b/t/help-silent.sh
old mode 100755
new mode 100644
diff --git a/t/help-upc.sh b/t/help-upc.sh
old mode 100755
new mode 100644
diff --git a/t/help.sh b/t/help.sh
old mode 100755
new mode 100644
diff --git a/t/help2.sh b/t/help2.sh
old mode 100755
new mode 100644
diff --git a/t/help3.sh b/t/help3.sh
old mode 100755
new mode 100644
diff --git a/t/help4.sh b/t/help4.sh
old mode 100755
new mode 100644
diff --git a/t/hfs.sh b/t/hfs.sh
old mode 100755
new mode 100644
diff --git a/t/implicit.sh b/t/implicit.sh
old mode 100755
new mode 100644
diff --git a/t/includes-deprecation.sh b/t/includes-deprecation.sh
old mode 100755
new mode 100644
diff --git a/t/init.sh b/t/init.sh
old mode 100755
new mode 100644
diff --git a/t/init2.sh b/t/init2.sh
old mode 100755
new mode 100644
diff --git a/t/insh2.sh b/t/insh2.sh
old mode 100755
new mode 100644
diff --git a/t/install-info-dir.sh b/t/install-info-dir.sh
old mode 100755
new mode 100644
diff --git a/t/install2.sh b/t/install2.sh
old mode 100755
new mode 100644
diff --git a/t/installdir.sh b/t/installdir.sh
old mode 100755
new mode 100644
diff --git a/t/instdat.sh b/t/instdat.sh
old mode 100755
new mode 100644
diff --git a/t/instdat2.sh b/t/instdat2.sh
old mode 100755
new mode 100644
diff --git a/t/instdir-cond.sh b/t/instdir-cond.sh
old mode 100755
new mode 100644
diff --git a/t/instdir-cond2.sh b/t/instdir-cond2.sh
old mode 100755
new mode 100644
diff --git a/t/instdir-java.sh b/t/instdir-java.sh
old mode 100755
new mode 100644
diff --git a/t/instdir-lisp.sh b/t/instdir-lisp.sh
old mode 100755
new mode 100644
diff --git a/t/instdir-ltlib.sh b/t/instdir-ltlib.sh
old mode 100755
new mode 100644
diff --git a/t/instdir-no-empty.sh b/t/instdir-no-empty.sh
old mode 100755
new mode 100644
diff --git a/t/instdir-prog.sh b/t/instdir-prog.sh
old mode 100755
new mode 100644
diff --git a/t/instdir-python.sh b/t/instdir-python.sh
old mode 100755
new mode 100644
diff --git a/t/instdir-texi.sh b/t/instdir-texi.sh
old mode 100755
new mode 100644
diff --git a/t/instdir.sh b/t/instdir.sh
old mode 100755
new mode 100644
diff --git a/t/instdir2.sh b/t/instdir2.sh
old mode 100755
new mode 100644
diff --git a/t/instexec.sh b/t/instexec.sh
old mode 100755
new mode 100644
diff --git a/t/instfail-info.sh b/t/instfail-info.sh
old mode 100755
new mode 100644
diff --git a/t/instfail-java.sh b/t/instfail-java.sh
old mode 100755
new mode 100644
diff --git a/t/instfail-libtool.sh b/t/instfail-libtool.sh
old mode 100755
new mode 100644
diff --git a/t/instfail.sh b/t/instfail.sh
old mode 100755
new mode 100644
diff --git a/t/insthook.sh b/t/insthook.sh
old mode 100755
new mode 100644
diff --git a/t/instman.sh b/t/instman.sh
old mode 100755
new mode 100644
diff --git a/t/instman2.sh b/t/instman2.sh
old mode 100755
new mode 100644
diff --git a/t/instmany-mans.sh b/t/instmany-mans.sh
old mode 100755
new mode 100644
diff --git a/t/instmany-python.sh b/t/instmany-python.sh
old mode 100755
new mode 100644
diff --git a/t/instmany.sh b/t/instmany.sh
old mode 100755
new mode 100644
diff --git a/t/instsh.sh b/t/instsh.sh
old mode 100755
new mode 100644
diff --git a/t/instsh2.sh b/t/instsh2.sh
old mode 100755
new mode 100644
diff --git a/t/instsh3.sh b/t/instsh3.sh
old mode 100755
new mode 100644
diff --git a/t/instspc.tap b/t/instspc.tap
old mode 100755
new mode 100644
diff --git a/t/interp.sh b/t/interp.sh
old mode 100755
new mode 100644
diff --git a/t/interp2.sh b/t/interp2.sh
old mode 100755
new mode 100644
diff --git a/t/java-check.sh b/t/java-check.sh
old mode 100755
new mode 100644
diff --git a/t/java-clean.sh b/t/java-clean.sh
old mode 100755
new mode 100644
diff --git a/t/java-compile-install.sh b/t/java-compile-install.sh
old mode 100755
new mode 100644
diff --git a/t/java-compile-run-flat.sh b/t/java-compile-run-flat.sh
old mode 100755
new mode 100644
diff --git a/t/java-compile-run-nested.sh b/t/java-compile-run-nested.sh
old mode 100755
new mode 100644
diff --git a/t/java-empty-classpath.sh b/t/java-empty-classpath.sh
old mode 100755
new mode 100644
index 387c4c3..cc3dae3
--- 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
old mode 100755
new mode 100644
diff --git a/t/java-mix.sh b/t/java-mix.sh
old mode 100755
new mode 100644
diff --git a/t/java-no-duplicate.sh b/t/java-no-duplicate.sh
old mode 100755
new mode 100644
diff --git a/t/java-nobase.sh b/t/java-nobase.sh
old mode 100755
new mode 100644
diff --git a/t/java-noinst.sh b/t/java-noinst.sh
old mode 100755
new mode 100644
diff --git a/t/java-rebuild.sh b/t/java-rebuild.sh
old mode 100755
new mode 100644
diff --git a/t/java-sources.sh b/t/java-sources.sh
old mode 100755
new mode 100644
diff --git a/t/java-uninstall.sh b/t/java-uninstall.sh
old mode 100755
new mode 100644
diff --git a/t/java.sh b/t/java.sh
old mode 100755
new mode 100644
diff --git a/t/java2.sh b/t/java2.sh
old mode 100755
new mode 100644
diff --git a/t/java3.sh b/t/java3.sh
old mode 100755
new mode 100644
diff --git a/t/javadir-undefined.sh b/t/javadir-undefined.sh
old mode 100755
new mode 100644
diff --git a/t/javaflags.sh b/t/javaflags.sh
old mode 100755
new mode 100644
index c1c2671..bb9ab26
--- a/t/javaflags.sh
+++ b/t/javaflags.sh
@@ -26,7 +26,7 @@ chmod a+x fake-javac
 
 # Remove JAVAC from the environment, so that it won't interfere
 # with 'make -e' below.
-unset JAVAC || :
+unset JAVAC
 
 cat >> configure.ac <<'END'
 AC_PROG_CC
diff --git a/t/javaprim.sh b/t/javaprim.sh
old mode 100755
new mode 100644
diff --git a/t/javasubst.sh b/t/javasubst.sh
old mode 100755
new mode 100644
diff --git a/t/ldadd.sh b/t/ldadd.sh
old mode 100755
new mode 100644
diff --git a/t/ldflags.sh b/t/ldflags.sh
old mode 100755
new mode 100644
diff --git a/t/lex-clean-cxx.sh b/t/lex-clean-cxx.sh
old mode 100755
new mode 100644
diff --git a/t/lex-clean.sh b/t/lex-clean.sh
old mode 100755
new mode 100644
diff --git a/t/lex-depend-cxx.sh b/t/lex-depend-cxx.sh
old mode 100755
new mode 100644
diff --git a/t/lex-depend-grep.sh b/t/lex-depend-grep.sh
old mode 100755
new mode 100644
diff --git a/t/lex-depend.sh b/t/lex-depend.sh
old mode 100755
new mode 100644
diff --git a/t/lex-header.sh b/t/lex-header.sh
old mode 100755
new mode 100644
diff --git a/t/lex-lib-external.sh b/t/lex-lib-external.sh
old mode 100755
new mode 100644
diff --git a/t/lex-lib.sh b/t/lex-lib.sh
old mode 100755
new mode 100644
diff --git a/t/lex-libobj.sh b/t/lex-libobj.sh
old mode 100755
new mode 100644
diff --git a/t/lex-line.sh b/t/lex-line.sh
old mode 100755
new mode 100644
index 258f6af..ec9fcd3
--- a/t/lex-line.sh
+++ b/t/lex-line.sh
@@ -15,15 +15,13 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Check that automake lex support ensures that lex-generated C
-# files use correct "#line" directives.  Try also with the
-# 'subdir-object' option enabled.
+# files use correct "#line" directives.
 # See also sister test 'yacc-line.sh'.
 
 required='cc lex'
 . test-init.sh
 
 cat >> configure.ac << 'END'
-AC_CONFIG_FILES([sub/Makefile])
 AC_PROG_CC
 AC_PROG_LEX
 AC_OUTPUT
@@ -32,7 +30,6 @@ END
 mkdir dir sub sub/dir
 
 cat > Makefile.am << 'END'
-SUBDIRS = sub
 bin_PROGRAMS = foo bar
 LDADD = $(LEXLIB)
 bar_LFLAGS = -v
@@ -43,19 +40,6 @@ address@hidden@: zardoz.c
 address@hidden@: bar-quux.c
 END
 
-cat > sub/Makefile.am << 'END'
-AUTOMAKE_OPTIONS = subdir-objects
-noinst_PROGRAMS = foo bar
-## We already used $(LEXLIB) above, so try @LEXLIB@ now.
-LDADD = @LEXLIB@
-foo_LFLAGS = -v
-foo_SOURCES = zardoz.l
-bar_SOURCES = dir/quux.l
-## Avoid spurious failures with Solaris make.
address@hidden@: foo-zardoz.c
-dir/address@hidden@: dir/quux.c
-END
-
 cat > zardoz.l << 'END'
 %{
 #define YY_NO_UNISTD_H 1
@@ -79,10 +63,8 @@ int yywrap (void)
 END
 
 cp zardoz.l dir/quux.l
-cp zardoz.l sub/zardoz.l
-cp zardoz.l sub/dir/quux.l
 
-c_outputs='zardoz.c bar-quux.c sub/foo-zardoz.c sub/dir/quux.c'
+c_outputs='zardoz.c dir/bar-quux.c'
 
 $ACLOCAL
 $AUTOCONF
@@ -104,7 +86,7 @@ for vpath in : false; do
   $MAKE
 
   # For debugging,
-  ls -l . sub sub/dir
+  ls -l . dir
   $EGREP 'line|\.l' $c_outputs
 
   grep '#.*line.*build.*\.l' $c_outputs && exit 1
@@ -118,14 +100,10 @@ for vpath in : false; do
   grep "#.*\.l.*\.l" $c_outputs && exit 1
   if $vpath; then
     grep '#.*line.*"\.\./zardoz\.l"' zardoz.c
-    grep '#.*line.*"\.\./dir/quux\.l"' bar-quux.c
-    grep '#.*line.*"\.\./\.\./sub/zardoz\.l"' sub/foo-zardoz.c
-    grep '#.*line.*"\.\./\.\./sub/dir/quux\.l"' sub/dir/quux.c
+    grep '#.*line.*"\.\./dir/quux\.l"' dir/bar-quux.c
   else
     grep '#.*line.*"zardoz\.l"' zardoz.c
-    grep '#.*line.*"dir/quux\.l"' bar-quux.c
-    grep '#.*line.*"zardoz\.l"' sub/foo-zardoz.c
-    grep '#.*line.*"dir/quux\.l"' sub/dir/quux.c
+    grep '#.*line.*"dir/quux\.l"' dir/bar-quux.c
   fi
 
   cd $srcdir
diff --git a/t/lex-multiple.sh b/t/lex-multiple.sh
old mode 100755
new mode 100644
diff --git a/t/lex-nodist.sh b/t/lex-nodist.sh
old mode 100755
new mode 100644
diff --git a/t/lex-noyywrap.sh b/t/lex-noyywrap.sh
old mode 100755
new mode 100644
diff --git a/t/lex-pr204.sh b/t/lex-pr204.sh
old mode 100755
new mode 100644
diff --git a/t/lex-subobj-nodep.sh b/t/lex-subobj-nodep.sh
old mode 100755
new mode 100644
diff --git a/t/lex.sh b/t/lex.sh
old mode 100755
new mode 100644
diff --git a/t/lex2.sh b/t/lex2.sh
old mode 100755
new mode 100644
diff --git a/t/lex3.sh b/t/lex3.sh
old mode 100755
new mode 100644
diff --git a/t/lex5.sh b/t/lex5.sh
old mode 100755
new mode 100644
diff --git a/t/lexcpp.sh b/t/lexcpp.sh
old mode 100755
new mode 100644
diff --git a/t/lexvpath.sh b/t/lexvpath.sh
old mode 100755
new mode 100644
diff --git a/t/lflags.sh b/t/lflags.sh
old mode 100755
new mode 100644
index 3074bdf..18268b1
--- a/t/lflags.sh
+++ b/t/lflags.sh
@@ -31,7 +31,7 @@ chmod a+x fake-lex
 
 # Remove Lex from the environment, so that it won't interfere
 # with 'make -e' below.
-unset LEX || :
+unset LEX
 
 cat >> configure.ac <<'END'
 AC_SUBST([CC], [false])
diff --git a/t/lflags2.sh b/t/lflags2.sh
old mode 100755
new mode 100644
index 2507778..a959aea
--- a/t/lflags2.sh
+++ b/t/lflags2.sh
@@ -30,7 +30,7 @@ chmod a+x fake-lex
 
 # Remove Lex from the environment, so that it won't interfere
 # with 'make -e' below.
-unset LEX || :
+unset LEX
 
 cat >> configure.ac <<'END'
 AC_SUBST([CXX], [false])
diff --git a/t/libexec.sh b/t/libexec.sh
old mode 100755
new mode 100644
diff --git a/t/libobj-basic.sh b/t/libobj-basic.sh
old mode 100755
new mode 100644
diff --git a/t/libobj10.sh b/t/libobj10.sh
old mode 100755
new mode 100644
diff --git a/t/libobj12.sh b/t/libobj12.sh
old mode 100755
new mode 100644
diff --git a/t/libobj13.sh b/t/libobj13.sh
old mode 100755
new mode 100644
diff --git a/t/libobj14.sh b/t/libobj14.sh
old mode 100755
new mode 100644
diff --git a/t/libobj15a.sh b/t/libobj15a.sh
old mode 100755
new mode 100644
diff --git a/t/libobj15b.sh b/t/libobj15b.sh
old mode 100755
new mode 100644
diff --git a/t/libobj15c.sh b/t/libobj15c.sh
old mode 100755
new mode 100644
diff --git a/t/libobj16a.sh b/t/libobj16a.sh
old mode 100755
new mode 100644
diff --git a/t/libobj16b.sh b/t/libobj16b.sh
old mode 100755
new mode 100644
diff --git a/t/libobj17.sh b/t/libobj17.sh
old mode 100755
new mode 100644
diff --git a/t/libobj18.sh b/t/libobj18.sh
old mode 100755
new mode 100644
diff --git a/t/libobj19.sh b/t/libobj19.sh
old mode 100755
new mode 100644
diff --git a/t/libobj2.sh b/t/libobj2.sh
old mode 100755
new mode 100644
diff --git a/t/libobj20a.sh b/t/libobj20a.sh
deleted file mode 100755
index 635798c..0000000
--- a/t/libobj20a.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010-2013 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test error reporting for AC_CONFIG_LIBOBJ_DIR.
-# See also sister tests 'libobj20b.sh' and 'libobj20c.sh'.
-
-. test-init.sh
-
-cat >> configure.ac << 'END'
-AC_CONFIG_LIBOBJ_DIR([libobj-dir])
-AC_PROG_CC
-AM_PROG_AR
-AC_PROG_RANLIB
-AC_LIBOBJ([foo])
-END
-
-cat > Makefile.am << 'END'
-noinst_LIBRARIES = libtu.a
-libtu_a_SOURCES =
-libtu_a_LIBADD = $(LIBOBJS)
-END
-
-mkdir libobj-dir
-: > libobj-dir/foo.c
-: > ar-lib
-
-$ACLOCAL
-AUTOMAKE_fails
-grep 'LIBOBJS.*used outside.*libobj-dir' stderr
-grep 'subdir-objects.*not set' stderr
-
-:
diff --git a/t/libobj20b.sh b/t/libobj20b.sh
old mode 100755
new mode 100644
index f86a46c..70442dd
--- a/t/libobj20b.sh
+++ b/t/libobj20b.sh
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Test error reporting for AC_CONFIG_LIBOBJ_DIR.
-# See also sister tests 'libobj20a.sh' and 'libobj20c.sh'.
+# See also sister test 'libobj20c.sh'.
 
 . test-init.sh
 
diff --git a/t/libobj20c.sh b/t/libobj20c.sh
old mode 100755
new mode 100644
index 7b91802..5f8eb68
--- a/t/libobj20c.sh
+++ b/t/libobj20c.sh
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Test error reporting for AC_CONFIG_LIBOBJ_DIR.
-# See also sister tests 'libobj20a.sh' and 'libobj20b.sh'.
+# See also sister test 'libobj20b.sh'.
 
 . test-init.sh
 
diff --git a/t/libobj3.sh b/t/libobj3.sh
old mode 100755
new mode 100644
diff --git a/t/libobj4.sh b/t/libobj4.sh
old mode 100755
new mode 100644
diff --git a/t/libobj5.sh b/t/libobj5.sh
old mode 100755
new mode 100644
diff --git a/t/libobj7.sh b/t/libobj7.sh
old mode 100755
new mode 100644
diff --git a/t/library.sh b/t/library.sh
old mode 100755
new mode 100644
diff --git a/t/library2.sh b/t/library2.sh
old mode 100755
new mode 100644
diff --git a/t/library3.sh b/t/library3.sh
old mode 100755
new mode 100644
diff --git a/t/libtoo10.sh b/t/libtoo10.sh
old mode 100755
new mode 100644
diff --git a/t/libtoo11.sh b/t/libtoo11.sh
old mode 100755
new mode 100644
diff --git a/t/libtool-macros.sh b/t/libtool-macros.sh
old mode 100755
new mode 100644
diff --git a/t/libtool.sh b/t/libtool.sh
old mode 100755
new mode 100644
diff --git a/t/libtool2.sh b/t/libtool2.sh
old mode 100755
new mode 100644
diff --git a/t/libtool3.sh b/t/libtool3.sh
old mode 100755
new mode 100644
index 5653280..4f45a39
--- 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
@@ -79,12 +75,10 @@ $ACLOCAL
 $AUTOCONF
 $AUTOMAKE --add-missing --copy
 
-# We need explicit rules to build 1.o and a.lo.  Make sure
-# Automake did not output additional rules for 1.lo and and a.lo.
-$FGREP '1.o:' Makefile.in
-$FGREP '1.lo:' Makefile.in && exit 1
-$FGREP 'a.o:' Makefile.in && exit 1
-$FGREP 'a.lo:' Makefile.in
+# We shouldn't need explicit rules.
+grep -v '^\.c' Makefile.in \
+  | $FGREP -v '$(am__dirstamp)' \
+  | $EGREP '\.(o|obj|lo).*:' && exit 1
 
 ./configure
 
diff --git a/t/libtool4.sh b/t/libtool4.sh
old mode 100755
new mode 100644
diff --git a/t/libtool5.sh b/t/libtool5.sh
old mode 100755
new mode 100644
diff --git a/t/libtool6.sh b/t/libtool6.sh
old mode 100755
new mode 100644
diff --git a/t/libtool7.sh b/t/libtool7.sh
old mode 100755
new mode 100644
diff --git a/t/libtool8.sh b/t/libtool8.sh
old mode 100755
new mode 100644
diff --git a/t/libtool9.sh b/t/libtool9.sh
old mode 100755
new mode 100644
diff --git a/t/license.sh b/t/license.sh
old mode 100755
new mode 100644
diff --git a/t/license2.sh b/t/license2.sh
old mode 100755
new mode 100644
diff --git a/t/link_c_cxx.sh b/t/link_c_cxx.sh
old mode 100755
new mode 100644
diff --git a/t/link_cond.sh b/t/link_cond.sh
old mode 100755
new mode 100644
diff --git a/t/link_dist.sh b/t/link_dist.sh
old mode 100755
new mode 100644
diff --git a/t/link_f90_only.sh b/t/link_f90_only.sh
old mode 100755
new mode 100644
diff --git a/t/link_f_only.sh b/t/link_f_only.sh
old mode 100755
new mode 100644
diff --git a/t/link_fc.sh b/t/link_fc.sh
old mode 100755
new mode 100644
diff --git a/t/link_fccxx.sh b/t/link_fccxx.sh
old mode 100755
new mode 100644
diff --git a/t/link_fcxx.sh b/t/link_fcxx.sh
old mode 100755
new mode 100644
diff --git a/t/link_override.sh b/t/link_override.sh
old mode 100755
new mode 100644
diff --git a/t/lisp-flags.sh b/t/lisp-flags.sh
old mode 100755
new mode 100644
index 1ea5b8e..a31bcfd
--- 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
old mode 100755
new mode 100644
diff --git a/t/lisp-pr11806.sh b/t/lisp-pr11806.sh
old mode 100755
new mode 100644
diff --git a/t/lisp-subdir-mix.sh b/t/lisp-subdir-mix.sh
old mode 100755
new mode 100644
diff --git a/t/lisp-subdir.sh b/t/lisp-subdir.sh
old mode 100755
new mode 100644
diff --git a/t/lisp-subdir2.sh b/t/lisp-subdir2.sh
old mode 100755
new mode 100644
diff --git a/t/lisp2.sh b/t/lisp2.sh
old mode 100755
new mode 100644
diff --git a/t/lisp3.sh b/t/lisp3.sh
old mode 100755
new mode 100644
diff --git a/t/lisp4.sh b/t/lisp4.sh
old mode 100755
new mode 100644
diff --git a/t/lisp5.sh b/t/lisp5.sh
old mode 100755
new mode 100644
diff --git a/t/lisp6.sh b/t/lisp6.sh
old mode 100755
new mode 100644
index 4b5f006..0dd4344
--- 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
old mode 100755
new mode 100644
diff --git a/t/lisp8.sh b/t/lisp8.sh
old mode 100755
new mode 100644
diff --git a/t/lispdry.sh b/t/lispdry.sh
old mode 100755
new mode 100644
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index 0d6f5d1..18109ac 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -604,7 +604,6 @@ t/libobj16b.sh \
 t/libobj17.sh \
 t/libobj18.sh \
 t/libobj19.sh \
-t/libobj20a.sh \
 t/libobj20b.sh \
 t/libobj20c.sh \
 t/library.sh \
@@ -991,7 +990,6 @@ t/silent-configsite.sh \
 t/silent-nested-vars.sh \
 t/silent-custom.sh \
 t/src-acsubst.sh \
-t/sourcefile-in-subdir.sh \
 t/space.sh \
 t/specflg6.sh \
 t/specflg7.sh \
@@ -1028,7 +1026,6 @@ t/subdir-distclean.sh \
 t/subdir-keep-going-pr12554.sh \
 t/subobj.sh \
 t/subobj2.sh \
-t/subobj4.sh \
 t/subobj5.sh \
 t/subobj6.sh \
 t/subobj7.sh \
diff --git a/t/listval.sh b/t/listval.sh
old mode 100755
new mode 100644
diff --git a/t/location.sh b/t/location.sh
old mode 100755
new mode 100644
diff --git a/t/longlin2.sh b/t/longlin2.sh
old mode 100755
new mode 100644
diff --git a/t/longline.sh b/t/longline.sh
old mode 100755
new mode 100644
diff --git a/t/ltcond.sh b/t/ltcond.sh
old mode 100755
new mode 100644
diff --git a/t/ltcond2.sh b/t/ltcond2.sh
old mode 100755
new mode 100644
diff --git a/t/ltconv.sh b/t/ltconv.sh
old mode 100755
new mode 100644
diff --git a/t/ltdeps.sh b/t/ltdeps.sh
old mode 100755
new mode 100644
diff --git a/t/ltinit.sh b/t/ltinit.sh
old mode 100755
new mode 100644
diff --git a/t/ltinstloc.sh b/t/ltinstloc.sh
old mode 100755
new mode 100644
diff --git a/t/ltlibobjs.sh b/t/ltlibobjs.sh
old mode 100755
new mode 100644
diff --git a/t/ltlibsrc.sh b/t/ltlibsrc.sh
old mode 100755
new mode 100644
index 8c8098b..c497968
--- a/t/ltlibsrc.sh
+++ b/t/ltlibsrc.sh
@@ -33,12 +33,19 @@ AM_LDFLAGS = -module
 pkglib_LTLIBRARIES = zoo.d/bar.la old.la
 noinst_LTLIBRARIES = foo.la zoo.d/old2.la
 
-$(srcdir)/zoo_d_old2_la.c: $(srcdir)/old_la.c
+zoo_d_old2_la.c: $(srcdir)/old_la.c
        cp $(srcdir)/old_la.c $@
 
 AUTOMAKE_OPTIONS = -Wno-unsupported
 END
 
+if useless_vpath_rebuild; then
+  unindent >> Makefile.am <<'END'
+    # Work around a known FreeBSD make issues in VPATH builds.
+    DISTCLEANFILES = zoo_d_old2_la.c
+END
+fi
+
 cat > foo.c << 'END'
 int foo (void)
 {
diff --git a/t/ltorder.sh b/t/ltorder.sh
old mode 100755
new mode 100644
diff --git a/t/m4-inclusion.sh b/t/m4-inclusion.sh
old mode 100755
new mode 100644
diff --git a/t/maintclean-vpath.sh b/t/maintclean-vpath.sh
old mode 100755
new mode 100644
diff --git a/t/maintclean.sh b/t/maintclean.sh
old mode 100755
new mode 100644
diff --git a/t/maintmode-configure-msg.sh b/t/maintmode-configure-msg.sh
old mode 100755
new mode 100644
diff --git a/t/make-dryrun.tap b/t/make-dryrun.tap
old mode 100755
new mode 100644
diff --git a/t/make-is-gnu.sh b/t/make-is-gnu.sh
old mode 100755
new mode 100644
diff --git a/t/make-keepgoing.tap b/t/make-keepgoing.tap
old mode 100755
new mode 100644
diff --git a/t/make.sh b/t/make.sh
old mode 100755
new mode 100644
diff --git a/t/makefile-deps.sh b/t/makefile-deps.sh
old mode 100755
new mode 100644
diff --git a/t/makej.sh b/t/makej.sh
old mode 100755
new mode 100644
diff --git a/t/makej2.sh b/t/makej2.sh
old mode 100755
new mode 100644
diff --git a/t/maken.sh b/t/maken.sh
old mode 100755
new mode 100644
diff --git a/t/maken3.sh b/t/maken3.sh
old mode 100755
new mode 100644
diff --git a/t/makevars.sh b/t/makevars.sh
old mode 100755
new mode 100644
diff --git a/t/man.sh b/t/man.sh
old mode 100755
new mode 100644
diff --git a/t/man2.sh b/t/man2.sh
old mode 100755
new mode 100644
diff --git a/t/man3.sh b/t/man3.sh
old mode 100755
new mode 100644
diff --git a/t/man5.sh b/t/man5.sh
old mode 100755
new mode 100644
diff --git a/t/man6.sh b/t/man6.sh
old mode 100755
new mode 100644
diff --git a/t/man7.sh b/t/man7.sh
old mode 100755
new mode 100644
diff --git a/t/man8.sh b/t/man8.sh
old mode 100755
new mode 100644
diff --git a/t/mdate.sh b/t/mdate.sh
old mode 100755
new mode 100644
diff --git a/t/mdate2.sh b/t/mdate2.sh
old mode 100755
new mode 100644
diff --git a/t/mdate3.sh b/t/mdate3.sh
old mode 100755
new mode 100644
diff --git a/t/mdate4.sh b/t/mdate4.sh
old mode 100755
new mode 100644
diff --git a/t/mdate5.sh b/t/mdate5.sh
old mode 100755
new mode 100644
diff --git a/t/mdate6.sh b/t/mdate6.sh
old mode 100755
new mode 100644
diff --git a/t/missing-auxfile-stops-makefiles-creation.sh 
b/t/missing-auxfile-stops-makefiles-creation.sh
old mode 100755
new mode 100644
index 50aa48a..754b316
--- 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
old mode 100755
new mode 100644
diff --git a/t/missing3.sh b/t/missing3.sh
old mode 100755
new mode 100644
diff --git a/t/mkinst2.sh b/t/mkinst2.sh
old mode 100755
new mode 100644
diff --git a/t/mkinst3.sh b/t/mkinst3.sh
old mode 100755
new mode 100644
diff --git a/t/mkinstall.sh b/t/mkinstall.sh
old mode 100755
new mode 100644
diff --git a/t/mmode.sh b/t/mmode.sh
old mode 100755
new mode 100644
diff --git a/t/mmodely.sh b/t/mmodely.sh
old mode 100755
new mode 100644
diff --git a/t/no-extra-makefile-code.sh b/t/no-extra-makefile-code.sh
old mode 100755
new mode 100644
diff --git a/t/no-spurious-install-recursive.sh 
b/t/no-spurious-install-recursive.sh
old mode 100755
new mode 100644
diff --git a/t/nobase-libtool.sh b/t/nobase-libtool.sh
old mode 100755
new mode 100644
diff --git a/t/nobase-nodist.sh b/t/nobase-nodist.sh
old mode 100755
new mode 100644
diff --git a/t/nobase-python.sh b/t/nobase-python.sh
old mode 100755
new mode 100644
diff --git a/t/nobase.sh b/t/nobase.sh
old mode 100755
new mode 100644
diff --git a/t/nodef.sh b/t/nodef.sh
old mode 100755
new mode 100644
diff --git a/t/nodef2.sh b/t/nodef2.sh
old mode 100755
new mode 100644
diff --git a/t/nodep.sh b/t/nodep.sh
old mode 100755
new mode 100644
diff --git a/t/nodep2.sh b/t/nodep2.sh
old mode 100755
new mode 100644
diff --git a/t/nodepcomp.sh b/t/nodepcomp.sh
old mode 100755
new mode 100644
diff --git a/t/nodist.sh b/t/nodist.sh
old mode 100755
new mode 100644
diff --git a/t/nodist2.sh b/t/nodist2.sh
old mode 100755
new mode 100644
diff --git a/t/nodist3.sh b/t/nodist3.sh
old mode 100755
new mode 100644
diff --git a/t/noinst.sh b/t/noinst.sh
old mode 100755
new mode 100644
diff --git a/t/noinstdir.sh b/t/noinstdir.sh
old mode 100755
new mode 100644
diff --git a/t/nolink.sh b/t/nolink.sh
old mode 100755
new mode 100644
diff --git a/t/nostdinc.sh b/t/nostdinc.sh
old mode 100755
new mode 100644
diff --git a/t/notrans.sh b/t/notrans.sh
old mode 100755
new mode 100644
diff --git a/t/number.sh b/t/number.sh
old mode 100755
new mode 100644
diff --git a/t/objc-basic.sh b/t/objc-basic.sh
old mode 100755
new mode 100644
diff --git a/t/objc-deps.sh b/t/objc-deps.sh
old mode 100755
new mode 100644
diff --git a/t/objc-flags.sh b/t/objc-flags.sh
old mode 100755
new mode 100644
diff --git a/t/objc-megademo.sh b/t/objc-megademo.sh
old mode 100755
new mode 100644
diff --git a/t/objc-minidemo.sh b/t/objc-minidemo.sh
old mode 100755
new mode 100644
diff --git a/t/objcxx-basic.sh b/t/objcxx-basic.sh
old mode 100755
new mode 100644
diff --git a/t/objcxx-deps.sh b/t/objcxx-deps.sh
old mode 100755
new mode 100644
diff --git a/t/objcxx-flags.sh b/t/objcxx-flags.sh
old mode 100755
new mode 100644
diff --git a/t/objcxx-minidemo.sh b/t/objcxx-minidemo.sh
old mode 100755
new mode 100644
diff --git a/t/objext-pr10128.sh b/t/objext-pr10128.sh
old mode 100755
new mode 100644
diff --git a/t/oldvars.sh b/t/oldvars.sh
old mode 100755
new mode 100644
diff --git a/t/order.sh b/t/order.sh
old mode 100755
new mode 100644
diff --git a/t/output-order.sh b/t/output-order.sh
old mode 100755
new mode 100644
diff --git a/t/output.sh b/t/output.sh
old mode 100755
new mode 100644
diff --git a/t/output10.sh b/t/output10.sh
old mode 100755
new mode 100644
diff --git a/t/output11.sh b/t/output11.sh
old mode 100755
new mode 100644
diff --git a/t/output12.sh b/t/output12.sh
old mode 100755
new mode 100644
diff --git a/t/output13.sh b/t/output13.sh
old mode 100755
new mode 100644
diff --git a/t/output2.sh b/t/output2.sh
old mode 100755
new mode 100644
diff --git a/t/output3.sh b/t/output3.sh
old mode 100755
new mode 100644
diff --git a/t/output4.sh b/t/output4.sh
old mode 100755
new mode 100644
diff --git a/t/output5.sh b/t/output5.sh
old mode 100755
new mode 100644
diff --git a/t/output6.sh b/t/output6.sh
old mode 100755
new mode 100644
diff --git a/t/output7.sh b/t/output7.sh
old mode 100755
new mode 100644
diff --git a/t/output8.sh b/t/output8.sh
old mode 100755
new mode 100644
diff --git a/t/output9.sh b/t/output9.sh
old mode 100755
new mode 100644
diff --git a/t/override-conditional-1.sh b/t/override-conditional-1.sh
old mode 100755
new mode 100644
diff --git a/t/override-conditional-2.sh b/t/override-conditional-2.sh
old mode 100755
new mode 100644
diff --git a/t/override-html.sh b/t/override-html.sh
old mode 100755
new mode 100644
diff --git a/t/override-suggest-local.sh b/t/override-suggest-local.sh
old mode 100755
new mode 100644
diff --git a/t/parallel-am.sh b/t/parallel-am.sh
old mode 100755
new mode 100644
index 4be5eea..ea39518
--- a/t/parallel-am.sh
+++ b/t/parallel-am.sh
@@ -80,7 +80,7 @@ $ACLOCAL
 # Further, automake output should be stable.
 
 # Generate expected output using the non-threaded code.
-unset AUTOMAKE_JOBS || :
+unset AUTOMAKE_JOBS
 AUTOMAKE_run --add-missing
 mv stderr expected
 Makefile_ins=$(find . -name Makefile.in)
diff --git a/t/parallel-am2.sh b/t/parallel-am2.sh
old mode 100755
new mode 100644
index 2f8627d..10fc51b
--- a/t/parallel-am2.sh
+++ b/t/parallel-am2.sh
@@ -60,7 +60,7 @@ $ACLOCAL
 # Thus we install the auxiliary files in a prior step.
 
 # Generate expected output using non-threaded code.
-unset AUTOMAKE_JOBS || :
+unset AUTOMAKE_JOBS
 rm -f install-sh missing depcomp
 AUTOMAKE_fails --add-missing
 mv stderr expected
diff --git a/t/parallel-am3.sh b/t/parallel-am3.sh
old mode 100755
new mode 100644
index 1c87e63..146e59f
--- a/t/parallel-am3.sh
+++ b/t/parallel-am3.sh
@@ -56,7 +56,7 @@ mkdir build-aux
 $ACLOCAL
 
 # Generate expected output using the non-threaded code.
-unset AUTOMAKE_JOBS || :
+unset AUTOMAKE_JOBS
 AUTOMAKE_run --add-missing
 mv stderr expected
 mv Makefile.in Makefile.in.exp
diff --git a/t/parallel-tests-basics.sh b/t/parallel-tests-basics.sh
old mode 100755
new mode 100644
diff --git a/t/parallel-tests-cmdline-override.sh 
b/t/parallel-tests-cmdline-override.sh
old mode 100755
new mode 100644
diff --git a/t/parallel-tests-concurrency-2.sh 
b/t/parallel-tests-concurrency-2.sh
old mode 100755
new mode 100644
diff --git a/t/parallel-tests-concurrency.sh b/t/parallel-tests-concurrency.sh
old mode 100755
new mode 100644
diff --git a/t/parallel-tests-console-output.sh 
b/t/parallel-tests-console-output.sh
old mode 100755
new mode 100644
diff --git a/t/parallel-tests-driver-install.sh 
b/t/parallel-tests-driver-install.sh
old mode 100755
new mode 100644
diff --git a/t/parallel-tests-dry-run-1.sh b/t/parallel-tests-dry-run-1.sh
old mode 100755
new mode 100644
diff --git a/t/parallel-tests-dry-run-2.sh b/t/parallel-tests-dry-run-2.sh
old mode 100755
new mode 100644
diff --git a/t/parallel-tests-empty-testlogs.sh 
b/t/parallel-tests-empty-testlogs.sh
old mode 100755
new mode 100644
diff --git a/t/parallel-tests-empty.sh b/t/parallel-tests-empty.sh
old mode 100755
new mode 100644
diff --git a/t/parallel-tests-exeext.sh b/t/parallel-tests-exeext.sh
old mode 100755
new mode 100644
diff --git a/t/parallel-tests-exit-statuses.sh 
b/t/parallel-tests-exit-statuses.sh
old mode 100755
new mode 100644
diff --git a/t/parallel-tests-extra-programs.sh 
b/t/parallel-tests-extra-programs.sh
old mode 100755
new mode 100644
diff --git a/t/parallel-tests-fd-redirect-exeext.sh 
b/t/parallel-tests-fd-redirect-exeext.sh
old mode 100755
new mode 100644
diff --git a/t/parallel-tests-fd-redirect.sh b/t/parallel-tests-fd-redirect.sh
old mode 100755
new mode 100644
diff --git a/t/parallel-tests-fork-bomb.sh b/t/parallel-tests-fork-bomb.sh
old mode 100755
new mode 100644
diff --git a/t/parallel-tests-generated-and-distributed.sh 
b/t/parallel-tests-generated-and-distributed.sh
old mode 100755
new mode 100644
diff --git a/t/parallel-tests-harderror.sh b/t/parallel-tests-harderror.sh
old mode 100755
new mode 100644
diff --git a/t/parallel-tests-interrupt.tap b/t/parallel-tests-interrupt.tap
old mode 100755
new mode 100644
diff --git a/t/parallel-tests-log-compiler-1.sh 
b/t/parallel-tests-log-compiler-1.sh
old mode 100755
new mode 100644
diff --git a/t/parallel-tests-log-compiler-2.sh 
b/t/parallel-tests-log-compiler-2.sh
old mode 100755
new mode 100644
diff --git a/t/parallel-tests-log-compiler-example.sh 
b/t/parallel-tests-log-compiler-example.sh
old mode 100755
new mode 100644
diff --git a/t/parallel-tests-log-override-1.sh 
b/t/parallel-tests-log-override-1.sh
old mode 100755
new mode 100644
diff --git a/t/parallel-tests-log-override-2.sh 
b/t/parallel-tests-log-override-2.sh
old mode 100755
new mode 100644
diff --git a/t/parallel-tests-log-override-recheck.sh 
b/t/parallel-tests-log-override-recheck.sh
old mode 100755
new mode 100644
index c2ea05d..d1fec7f
--- a/t/parallel-tests-log-override-recheck.sh
+++ b/t/parallel-tests-log-override-recheck.sh
@@ -47,7 +47,7 @@ END
 
 chmod a+x *.test
 
-unset BAZ_EXIT_STATUS || :
+unset BAZ_EXIT_STATUS
 
 $ACLOCAL
 $AUTOCONF
diff --git a/t/parallel-tests-no-color-in-log.sh 
b/t/parallel-tests-no-color-in-log.sh
old mode 100755
new mode 100644
diff --git a/t/parallel-tests-no-spurious-summary.sh 
b/t/parallel-tests-no-spurious-summary.sh
old mode 100755
new mode 100644
diff --git a/t/parallel-tests-once.sh b/t/parallel-tests-once.sh
old mode 100755
new mode 100644
diff --git a/t/parallel-tests-recheck-depends-on-all.sh 
b/t/parallel-tests-recheck-depends-on-all.sh
old mode 100755
new mode 100644
diff --git a/t/parallel-tests-recheck-pr11791.sh 
b/t/parallel-tests-recheck-pr11791.sh
old mode 100755
new mode 100644
diff --git a/t/parallel-tests-recheck.sh b/t/parallel-tests-recheck.sh
old mode 100755
new mode 100644
diff --git a/t/parallel-tests-reset-term.sh b/t/parallel-tests-reset-term.sh
old mode 100755
new mode 100644
diff --git a/t/parallel-tests-subdir.sh b/t/parallel-tests-subdir.sh
old mode 100755
new mode 100644
diff --git a/t/parallel-tests-suffix-prog.sh b/t/parallel-tests-suffix-prog.sh
old mode 100755
new mode 100644
diff --git a/t/parallel-tests-suffix.sh b/t/parallel-tests-suffix.sh
old mode 100755
new mode 100644
diff --git a/t/parallel-tests-trailing-whitespace.sh 
b/t/parallel-tests-trailing-whitespace.sh
old mode 100755
new mode 100644
diff --git a/t/parallel-tests-unreadable.sh b/t/parallel-tests-unreadable.sh
old mode 100755
new mode 100644
diff --git a/t/parse.sh b/t/parse.sh
old mode 100755
new mode 100644
diff --git a/t/per-target-flags.sh b/t/per-target-flags.sh
old mode 100755
new mode 100644
diff --git a/t/percent.sh b/t/percent.sh
old mode 100755
new mode 100644
diff --git a/t/percent2.sh b/t/percent2.sh
old mode 100755
new mode 100644
diff --git a/t/phony.sh b/t/phony.sh
old mode 100755
new mode 100644
diff --git a/t/pkg-config-macros.sh b/t/pkg-config-macros.sh
old mode 100755
new mode 100644
index 5069c08..cfa49cf
--- 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
old mode 100755
new mode 100644
diff --git a/t/pluseq10.sh b/t/pluseq10.sh
old mode 100755
new mode 100644
diff --git a/t/pluseq11.sh b/t/pluseq11.sh
old mode 100755
new mode 100644
diff --git a/t/pluseq2.sh b/t/pluseq2.sh
old mode 100755
new mode 100644
diff --git a/t/pluseq3.sh b/t/pluseq3.sh
old mode 100755
new mode 100644
diff --git a/t/pluseq4.sh b/t/pluseq4.sh
old mode 100755
new mode 100644
diff --git a/t/pluseq5.sh b/t/pluseq5.sh
old mode 100755
new mode 100644
diff --git a/t/pluseq6.sh b/t/pluseq6.sh
old mode 100755
new mode 100644
diff --git a/t/pluseq7.sh b/t/pluseq7.sh
old mode 100755
new mode 100644
diff --git a/t/pluseq8.sh b/t/pluseq8.sh
old mode 100755
new mode 100644
diff --git a/t/pluseq9.sh b/t/pluseq9.sh
old mode 100755
new mode 100644
diff --git a/t/posixsubst-data.sh b/t/posixsubst-data.sh
old mode 100755
new mode 100644
diff --git a/t/posixsubst-extradist.sh b/t/posixsubst-extradist.sh
old mode 100755
new mode 100644
diff --git a/t/posixsubst-ldadd.sh b/t/posixsubst-ldadd.sh
old mode 100755
new mode 100644
diff --git a/t/posixsubst-libraries.sh b/t/posixsubst-libraries.sh
old mode 100755
new mode 100644
diff --git a/t/posixsubst-ltlibraries.sh b/t/posixsubst-ltlibraries.sh
old mode 100755
new mode 100644
diff --git a/t/posixsubst-programs.sh b/t/posixsubst-programs.sh
old mode 100755
new mode 100644
diff --git a/t/posixsubst-scripts.sh b/t/posixsubst-scripts.sh
old mode 100755
new mode 100644
diff --git a/t/posixsubst-sources.sh b/t/posixsubst-sources.sh
old mode 100755
new mode 100644
diff --git a/t/posixsubst-tests.sh b/t/posixsubst-tests.sh
old mode 100755
new mode 100644
diff --git a/t/postproc.sh b/t/postproc.sh
old mode 100755
new mode 100644
diff --git a/t/ppf77.sh b/t/ppf77.sh
old mode 100755
new mode 100644
diff --git a/t/pr2.sh b/t/pr2.sh
old mode 100755
new mode 100644
diff --git a/t/pr211.sh b/t/pr211.sh
old mode 100755
new mode 100644
diff --git a/t/pr220.sh b/t/pr220.sh
old mode 100755
new mode 100644
diff --git a/t/pr224.sh b/t/pr224.sh
old mode 100755
new mode 100644
diff --git a/t/pr229.sh b/t/pr229.sh
old mode 100755
new mode 100644
diff --git a/t/pr243.sh b/t/pr243.sh
old mode 100755
new mode 100644
diff --git a/t/pr266.sh b/t/pr266.sh
old mode 100755
new mode 100644
diff --git a/t/pr279-2.sh b/t/pr279-2.sh
old mode 100755
new mode 100644
diff --git a/t/pr279.sh b/t/pr279.sh
old mode 100755
new mode 100644
diff --git a/t/pr287.sh b/t/pr287.sh
old mode 100755
new mode 100644
diff --git a/t/pr300-lib.sh b/t/pr300-lib.sh
old mode 100755
new mode 100644
diff --git a/t/pr300-ltlib.sh b/t/pr300-ltlib.sh
old mode 100755
new mode 100644
diff --git a/t/pr300-prog.sh b/t/pr300-prog.sh
old mode 100755
new mode 100644
diff --git a/t/pr307.sh b/t/pr307.sh
old mode 100755
new mode 100644
diff --git a/t/pr401.sh b/t/pr401.sh
old mode 100755
new mode 100644
index 89094de..090b2e9
--- a/t/pr401.sh
+++ b/t/pr401.sh
@@ -103,17 +103,6 @@ test ! -e lib/lib
 $MAKE distcheck
 
 ## -------------------------------------------- ##
-## Error message with usage in wrong directory. ##
-## -------------------------------------------- ##
-
-mv -f src/Makefile.am src/t
-sed 's/LDADD = .*/LDADD = @LIBOBJS@/' src/t > src/Makefile.am
-AUTOMAKE_fails
-grep 'cannot be used outside.*lib' stderr
-mv -f src/t src/Makefile.am
-
-
-## -------------------------------------------- ##
 ## Test using LIBOBJS from a sibling directory. ##
 ## -------------------------------------------- ##
 
diff --git a/t/pr401b.sh b/t/pr401b.sh
old mode 100755
new mode 100644
index cf7a698..f993108
--- a/t/pr401b.sh
+++ b/t/pr401b.sh
@@ -103,15 +103,6 @@ $AUTOMAKE -a
 test ! -e lib/lib
 $MAKE distcheck
 
-## -------------------------------------------- ##
-## Error message with usage in wrong directory. ##
-## -------------------------------------------- ##
-
-mv -f src/Makefile.am src/t
-sed 's/LDADD = .*/LDADD = @LTLIBOBJS@/' src/t > src/Makefile.am
-AUTOMAKE_fails
-grep 'cannot be used outside.*lib' stderr
-mv -f src/t src/Makefile.am
 
 ## ---------------------------------------------- ##
 ## Test using LTLIBOBJS from a sibling directory. ##
diff --git a/t/pr401c.sh b/t/pr401c.sh
old mode 100755
new mode 100644
index 22e5876..eb2f4fb
--- a/t/pr401c.sh
+++ b/t/pr401c.sh
@@ -104,16 +104,6 @@ $AUTOMAKE
 test ! -e lib/lib
 $MAKE distcheck
 
-## -------------------------------------------- ##
-## Error message with usage in wrong directory. ##
-## -------------------------------------------- ##
-
-mv -f src/Makefile.am src/t
-sed 's/LDADD = .*/LDADD = @ALLOCA@/' src/t > src/Makefile.am
-AUTOMAKE_fails
-grep 'cannot be used outside.*lib' stderr
-mv -f src/t src/Makefile.am
-
 
 ## ------------------------------------------- ##
 ## Test using ALLOCA from a sibling directory. ##
diff --git a/t/pr72.sh b/t/pr72.sh
old mode 100755
new mode 100644
diff --git a/t/pr87.sh b/t/pr87.sh
old mode 100755
new mode 100644
diff --git a/t/pr9.sh b/t/pr9.sh
old mode 100755
new mode 100644
diff --git a/t/prefix.sh b/t/prefix.sh
old mode 100755
new mode 100644
diff --git a/t/preproc-basics.sh b/t/preproc-basics.sh
old mode 100755
new mode 100644
diff --git a/t/preproc-c-compile.sh b/t/preproc-c-compile.sh
old mode 100755
new mode 100644
diff --git a/t/preproc-demo.sh b/t/preproc-demo.sh
old mode 100755
new mode 100644
diff --git a/t/preproc-errmsg.sh b/t/preproc-errmsg.sh
old mode 100755
new mode 100644
diff --git a/t/primary-prefix-couples-documented-valid.sh 
b/t/primary-prefix-couples-documented-valid.sh
old mode 100755
new mode 100644
diff --git a/t/primary-prefix-couples-force-valid.sh 
b/t/primary-prefix-couples-force-valid.sh
old mode 100755
new mode 100644
diff --git a/t/primary-prefix-invalid-couples.tap 
b/t/primary-prefix-invalid-couples.tap
old mode 100755
new mode 100644
diff --git a/t/primary-prefix-valid-couples.sh 
b/t/primary-prefix-valid-couples.sh
old mode 100755
new mode 100644
diff --git a/t/primary.sh b/t/primary.sh
old mode 100755
new mode 100644
diff --git a/t/primary2.sh b/t/primary2.sh
old mode 100755
new mode 100644
diff --git a/t/primary3.sh b/t/primary3.sh
old mode 100755
new mode 100644
diff --git a/t/print-libdir.sh b/t/print-libdir.sh
old mode 100755
new mode 100644
diff --git a/t/proginst.sh b/t/proginst.sh
old mode 100755
new mode 100644
diff --git a/t/programs-primary-rewritten.sh b/t/programs-primary-rewritten.sh
old mode 100755
new mode 100644
diff --git a/t/py-compile-basedir.sh b/t/py-compile-basedir.sh
old mode 100755
new mode 100644
diff --git a/t/py-compile-basic.sh b/t/py-compile-basic.sh
old mode 100755
new mode 100644
diff --git a/t/py-compile-destdir.sh b/t/py-compile-destdir.sh
old mode 100755
new mode 100644
diff --git a/t/py-compile-env.sh b/t/py-compile-env.sh
old mode 100755
new mode 100644
diff --git a/t/py-compile-option-terminate.sh b/t/py-compile-option-terminate.sh
old mode 100755
new mode 100644
diff --git a/t/py-compile-usage.sh b/t/py-compile-usage.sh
old mode 100755
new mode 100644
diff --git a/t/python-am-path-iftrue.sh b/t/python-am-path-iftrue.sh
old mode 100755
new mode 100644
diff --git a/t/python-dist.sh b/t/python-dist.sh
old mode 100755
new mode 100644
diff --git a/t/python-missing.sh b/t/python-missing.sh
old mode 100755
new mode 100644
index 0a9a073..66eca9e
--- 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
old mode 100755
new mode 100644
diff --git a/t/python-too-old.sh b/t/python-too-old.sh
old mode 100755
new mode 100644
index 6a81215..0042799
--- 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
old mode 100755
new mode 100644
diff --git a/t/python-virtualenv.sh b/t/python-virtualenv.sh
old mode 100755
new mode 100644
diff --git a/t/python.sh b/t/python.sh
old mode 100755
new mode 100644
diff --git a/t/python10.sh b/t/python10.sh
old mode 100755
new mode 100644
diff --git a/t/python11.sh b/t/python11.sh
old mode 100755
new mode 100644
index c5fedf7..faf09d8
--- 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
old mode 100755
new mode 100644
diff --git a/t/python2.sh b/t/python2.sh
old mode 100755
new mode 100644
diff --git a/t/python3.sh b/t/python3.sh
old mode 100755
new mode 100644
diff --git a/t/recurs-user-deeply-nested.sh b/t/recurs-user-deeply-nested.sh
old mode 100755
new mode 100644
diff --git a/t/recurs-user-indir.sh b/t/recurs-user-indir.sh
old mode 100755
new mode 100644
diff --git a/t/recurs-user-keep-going.sh b/t/recurs-user-keep-going.sh
old mode 100755
new mode 100644
diff --git a/t/recurs-user-many.sh b/t/recurs-user-many.sh
old mode 100755
new mode 100644
diff --git a/t/recurs-user-no-subdirs.sh b/t/recurs-user-no-subdirs.sh
old mode 100755
new mode 100644
diff --git a/t/recurs-user-no-top-level.sh b/t/recurs-user-no-top-level.sh
old mode 100755
new mode 100644
diff --git a/t/recurs-user-override.sh b/t/recurs-user-override.sh
old mode 100755
new mode 100644
diff --git a/t/recurs-user-phony.sh b/t/recurs-user-phony.sh
old mode 100755
new mode 100644
diff --git a/t/recurs-user-wrap.sh b/t/recurs-user-wrap.sh
old mode 100755
new mode 100644
diff --git a/t/recurs-user.sh b/t/recurs-user.sh
old mode 100755
new mode 100644
diff --git a/t/recurs-user2.sh b/t/recurs-user2.sh
old mode 100755
new mode 100644
diff --git a/t/relativize.tap b/t/relativize.tap
old mode 100755
new mode 100644
diff --git a/t/remake-aclocal-version-mismatch.sh 
b/t/remake-aclocal-version-mismatch.sh
old mode 100755
new mode 100644
diff --git a/t/remake-after-acinclude-m4.sh b/t/remake-after-acinclude-m4.sh
old mode 100755
new mode 100644
diff --git a/t/remake-after-aclocal-m4.sh b/t/remake-after-aclocal-m4.sh
old mode 100755
new mode 100644
diff --git a/t/remake-after-configure-ac.sh b/t/remake-after-configure-ac.sh
old mode 100755
new mode 100644
diff --git a/t/remake-after-makefile-am.sh b/t/remake-after-makefile-am.sh
old mode 100755
new mode 100644
diff --git a/t/remake-all-1.sh b/t/remake-all-1.sh
old mode 100755
new mode 100644
diff --git a/t/remake-all-2.sh b/t/remake-all-2.sh
old mode 100755
new mode 100644
diff --git a/t/remake-am-pr10111.sh b/t/remake-am-pr10111.sh
old mode 100755
new mode 100644
diff --git a/t/remake-config-status-dependencies.sh 
b/t/remake-config-status-dependencies.sh
old mode 100755
new mode 100644
diff --git a/t/remake-configure-dependencies.sh 
b/t/remake-configure-dependencies.sh
old mode 100755
new mode 100644
diff --git a/t/remake-deeply-nested.sh b/t/remake-deeply-nested.sh
old mode 100755
new mode 100644
index d17fd57..e054c20
--- 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
old mode 100755
new mode 100644
diff --git a/t/remake-deleted-am-subdir.sh b/t/remake-deleted-am-subdir.sh
old mode 100755
new mode 100644
diff --git a/t/remake-deleted-am.sh b/t/remake-deleted-am.sh
old mode 100755
new mode 100644
diff --git a/t/remake-deleted-m4-file.sh b/t/remake-deleted-m4-file.sh
old mode 100755
new mode 100644
diff --git a/t/remake-fail.sh b/t/remake-fail.sh
old mode 100755
new mode 100644
diff --git a/t/remake-gnulib-add-acsubst.sh b/t/remake-gnulib-add-acsubst.sh
old mode 100755
new mode 100644
diff --git a/t/remake-gnulib-add-header.sh b/t/remake-gnulib-add-header.sh
old mode 100755
new mode 100644
diff --git a/t/remake-gnulib-remove-header.sh b/t/remake-gnulib-remove-header.sh
old mode 100755
new mode 100644
diff --git a/t/remake-include-aclocal.sh b/t/remake-include-aclocal.sh
old mode 100755
new mode 100644
diff --git a/t/remake-include-configure.sh b/t/remake-include-configure.sh
old mode 100755
new mode 100644
diff --git a/t/remake-include-makefile.sh b/t/remake-include-makefile.sh
old mode 100755
new mode 100644
diff --git a/t/remake-m4-pr10111.sh b/t/remake-m4-pr10111.sh
old mode 100755
new mode 100644
diff --git a/t/remake-macrodir.sh b/t/remake-macrodir.sh
old mode 100755
new mode 100644
diff --git a/t/remake-maintainer-mode.sh b/t/remake-maintainer-mode.sh
old mode 100755
new mode 100644
diff --git a/t/remake-makefile-intree.sh b/t/remake-makefile-intree.sh
old mode 100755
new mode 100644
diff --git a/t/remake-makefile-vpath.sh b/t/remake-makefile-vpath.sh
old mode 100755
new mode 100644
diff --git a/t/remake-mild-stress.sh b/t/remake-mild-stress.sh
old mode 100755
new mode 100644
diff --git a/t/remake-moved-m4-file.sh b/t/remake-moved-m4-file.sh
old mode 100755
new mode 100644
diff --git a/t/remake-not-after-make-dist.sh b/t/remake-not-after-make-dist.sh
old mode 100755
new mode 100644
diff --git a/t/remake-recurs-user.sh b/t/remake-recurs-user.sh
old mode 100755
new mode 100644
diff --git a/t/remake-renamed-am.sh b/t/remake-renamed-am.sh
old mode 100755
new mode 100644
diff --git a/t/remake-renamed-m4-file.sh b/t/remake-renamed-m4-file.sh
old mode 100755
new mode 100644
diff --git a/t/remake-renamed-m4-macro-and-file.sh 
b/t/remake-renamed-m4-macro-and-file.sh
old mode 100755
new mode 100644
diff --git a/t/remake-renamed-m4-macro.sh b/t/remake-renamed-m4-macro.sh
old mode 100755
new mode 100644
diff --git a/t/remake-subdir-from-subdir.sh b/t/remake-subdir-from-subdir.sh
old mode 100755
new mode 100644
diff --git a/t/remake-subdir-gnu.sh b/t/remake-subdir-gnu.sh
old mode 100755
new mode 100644
diff --git a/t/remake-subdir-grepping.sh b/t/remake-subdir-grepping.sh
old mode 100755
new mode 100644
diff --git a/t/remake-subdir-long-time.sh b/t/remake-subdir-long-time.sh
old mode 100755
new mode 100644
diff --git a/t/remake-subdir-no-makefile.sh b/t/remake-subdir-no-makefile.sh
old mode 100755
new mode 100644
diff --git a/t/remake-subdir-only.sh b/t/remake-subdir-only.sh
old mode 100755
new mode 100644
diff --git a/t/remake-subdir.sh b/t/remake-subdir.sh
old mode 100755
new mode 100644
diff --git a/t/remake-subdir2.sh b/t/remake-subdir2.sh
old mode 100755
new mode 100644
diff --git a/t/remake-subdir3.sh b/t/remake-subdir3.sh
old mode 100755
new mode 100644
diff --git a/t/remake-timing-bug-pr8365.sh b/t/remake-timing-bug-pr8365.sh
old mode 100755
new mode 100644
diff --git a/t/repeated-options.sh b/t/repeated-options.sh
old mode 100755
new mode 100644
diff --git a/t/reqd2.sh b/t/reqd2.sh
old mode 100755
new mode 100644
diff --git a/t/rm-f-probe.sh b/t/rm-f-probe.sh
old mode 100755
new mode 100644
diff --git a/t/rulepat.sh b/t/rulepat.sh
old mode 100755
new mode 100644
diff --git a/t/sanity.sh b/t/sanity.sh
old mode 100755
new mode 100644
diff --git a/t/seenc.sh b/t/seenc.sh
old mode 100755
new mode 100644
diff --git a/t/self-check-cc-no-c-o.sh b/t/self-check-cc-no-c-o.sh
old mode 100755
new mode 100644
diff --git a/t/self-check-configure-help.sh b/t/self-check-configure-help.sh
old mode 100755
new mode 100644
diff --git a/t/self-check-dir.tap b/t/self-check-dir.tap
old mode 100755
new mode 100644
index b871b66..68e9edf
--- 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
old mode 100755
new mode 100644
diff --git a/t/self-check-explicit-skips.sh b/t/self-check-explicit-skips.sh
old mode 100755
new mode 100644
diff --git a/t/self-check-is-blocked-signal.tap 
b/t/self-check-is-blocked-signal.tap
old mode 100755
new mode 100644
diff --git a/t/self-check-is_newest.tap b/t/self-check-is_newest.tap
old mode 100755
new mode 100644
diff --git a/t/self-check-me.tap b/t/self-check-me.tap
old mode 100755
new mode 100644
diff --git a/t/self-check-report.sh b/t/self-check-report.sh
old mode 100755
new mode 100644
index c52c567..99b9838
--- 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
old mode 100755
new mode 100644
index 3c5e2dc..4e9d58f
--- 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
old mode 100755
new mode 100644
diff --git a/t/self-check-unindent.tap b/t/self-check-unindent.tap
old mode 100755
new mode 100644
diff --git a/t/serial-tests.sh b/t/serial-tests.sh
old mode 100755
new mode 100644
diff --git a/t/silent-c.sh b/t/silent-c.sh
old mode 100755
new mode 100644
diff --git a/t/silent-configsite.sh b/t/silent-configsite.sh
old mode 100755
new mode 100644
index 1df7673..6146533
--- a/t/silent-configsite.sh
+++ b/t/silent-configsite.sh
@@ -33,7 +33,7 @@ test-nosilent:
        test x'$(AM_DEFAULT_VERBOSITY)' = x'1'
 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
old mode 100755
new mode 100644
diff --git a/t/silent-cxx.sh b/t/silent-cxx.sh
old mode 100755
new mode 100644
diff --git a/t/silent-f77.sh b/t/silent-f77.sh
old mode 100755
new mode 100644
diff --git a/t/silent-f90.sh b/t/silent-f90.sh
old mode 100755
new mode 100644
diff --git a/t/silent-gen.sh b/t/silent-gen.sh
old mode 100755
new mode 100644
diff --git a/t/silent-lex.sh b/t/silent-lex.sh
old mode 100755
new mode 100644
diff --git a/t/silent-lt.sh b/t/silent-lt.sh
old mode 100755
new mode 100644
diff --git a/t/silent-many-languages.sh b/t/silent-many-languages.sh
old mode 100755
new mode 100644
diff --git a/t/silent-nested-vars.sh b/t/silent-nested-vars.sh
old mode 100755
new mode 100644
index f03204d..08f46fd
--- a/t/silent-nested-vars.sh
+++ b/t/silent-nested-vars.sh
@@ -67,7 +67,7 @@ case $1 in
     done ;;
 esac
 
-nested_var_pat='^[^#].*\$([^)]*\$'
+nested_var_pat='^[^#].*[^$]\$([^)]*\$'
 if
   case $makefile in
     -) printf '%s\n' "$makerules" | grep "$nested_var_pat";;
diff --git a/t/silent-texi.sh b/t/silent-texi.sh
old mode 100755
new mode 100644
diff --git a/t/silent-yacc-headers.sh b/t/silent-yacc-headers.sh
old mode 100755
new mode 100644
diff --git a/t/silent-yacc.sh b/t/silent-yacc.sh
old mode 100755
new mode 100644
diff --git a/t/sourcefile-in-subdir.sh b/t/sourcefile-in-subdir.sh
deleted file mode 100755
index 1054f18..0000000
--- a/t/sourcefile-in-subdir.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure subdir source file generates explicit dependency.
-
-. test-init.sh
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = zardoz widdershins
-zardoz_SOURCES = y.c x/z.c
-widdershins_SOURCES = x/z.c
-END
-
-cat >> configure.ac << 'END'
-AC_PROG_CC
-END
-
-$ACLOCAL
-$AUTOMAKE -Wno-unsupported
-
-grep '^z\.o: x/z\.c$' Makefile.in
-
-:
diff --git a/t/space.sh b/t/space.sh
old mode 100755
new mode 100644
diff --git a/t/specflg-dummy.sh b/t/specflg-dummy.sh
old mode 100755
new mode 100644
diff --git a/t/specflg6.sh b/t/specflg6.sh
old mode 100755
new mode 100644
diff --git a/t/specflg7.sh b/t/specflg7.sh
old mode 100755
new mode 100644
diff --git a/t/specflg8.sh b/t/specflg8.sh
old mode 100755
new mode 100644
diff --git a/t/specflg9.sh b/t/specflg9.sh
old mode 100755
new mode 100644
diff --git a/t/spell.sh b/t/spell.sh
old mode 100755
new mode 100644
diff --git a/t/spell2.sh b/t/spell2.sh
old mode 100755
new mode 100644
diff --git a/t/spell3.sh b/t/spell3.sh
old mode 100755
new mode 100644
diff --git a/t/spelling.sh b/t/spelling.sh
old mode 100755
new mode 100644
diff --git a/t/spy-double-colon.sh b/t/spy-double-colon.sh
old mode 100755
new mode 100644
diff --git a/t/spy-rm.tap b/t/spy-rm.tap
old mode 100755
new mode 100644
diff --git a/t/src-acsubst.sh b/t/src-acsubst.sh
old mode 100755
new mode 100644
diff --git a/t/stamph2.sh b/t/stamph2.sh
old mode 100755
new mode 100644
diff --git a/t/stdinc.sh b/t/stdinc.sh
old mode 100755
new mode 100644
diff --git a/t/stdlib.sh b/t/stdlib.sh
old mode 100755
new mode 100644
diff --git a/t/stdlib2.sh b/t/stdlib2.sh
old mode 100755
new mode 100644
diff --git a/t/strictness-override.sh b/t/strictness-override.sh
old mode 100755
new mode 100644
diff --git a/t/strictness-precedence.sh b/t/strictness-precedence.sh
old mode 100755
new mode 100644
diff --git a/t/strip.sh b/t/strip.sh
old mode 100755
new mode 100644
diff --git a/t/strip2.sh b/t/strip2.sh
old mode 100755
new mode 100644
diff --git a/t/strip3.sh b/t/strip3.sh
old mode 100755
new mode 100644
diff --git a/t/subdir-ac-subst.sh b/t/subdir-ac-subst.sh
old mode 100755
new mode 100644
diff --git a/t/subdir-add-pr46.sh b/t/subdir-add-pr46.sh
old mode 100755
new mode 100644
diff --git a/t/subdir-add2-pr46.sh b/t/subdir-add2-pr46.sh
old mode 100755
new mode 100644
diff --git a/t/subdir-am-cond.sh b/t/subdir-am-cond.sh
old mode 100755
new mode 100644
diff --git a/t/subdir-cond-err.sh b/t/subdir-cond-err.sh
old mode 100755
new mode 100644
diff --git a/t/subdir-cond-gettext.sh b/t/subdir-cond-gettext.sh
old mode 100755
new mode 100644
diff --git a/t/subdir-distclean.sh b/t/subdir-distclean.sh
old mode 100755
new mode 100644
diff --git a/t/subdir-env-interference.sh b/t/subdir-env-interference.sh
old mode 100755
new mode 100644
diff --git a/t/subdir-keep-going-pr12554.sh b/t/subdir-keep-going-pr12554.sh
old mode 100755
new mode 100644
diff --git a/t/subdir-order.sh b/t/subdir-order.sh
old mode 100755
new mode 100644
diff --git a/t/subdir-subsub.sh b/t/subdir-subsub.sh
old mode 100755
new mode 100644
diff --git a/t/subdir-with-slash.sh b/t/subdir-with-slash.sh
old mode 100755
new mode 100644
diff --git a/t/subdir.sh b/t/subdir.sh
old mode 100755
new mode 100644
diff --git a/t/subobj-clean-lt-pr10697.sh b/t/subobj-clean-lt-pr10697.sh
old mode 100755
new mode 100644
diff --git a/t/subobj-clean-pr10697.sh b/t/subobj-clean-pr10697.sh
old mode 100755
new mode 100644
diff --git a/t/subobj.sh b/t/subobj.sh
old mode 100755
new mode 100644
index f595e68..fa00368
--- a/t/subobj.sh
+++ b/t/subobj.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/>.
 
-# Test of subdir objects with C and C++.
+# Grepping checks on subdir objects with C and C++.
 
 . test-init.sh
 
@@ -42,36 +42,6 @@ dream_SOURCES = generic/b.c more/r.y
 bin_PROGRAMS = dream
 END
 
-AUTOMAKE_fails
-grep "^Makefile\.am:3:.*'generic/a\.c'.* in a subdirectory" stderr
-grep "^Makefile\.am:[34]:.*'another/z\.cxx'.* in a subdirectory" stderr
-grep "^sub/Makefile\.am:1:.*'generic/b\.c'.* in a subdirectory" stderr
-grep "option 'subdir-objects' is disabled" stderr
-# Verbose tips should be given, but not too many times.
-for msg in \
-  "possible forward-incompatibility" \
-  "advi[sc]e.* 'subdir-objects' option throughout" \
-  "unconditionally.* object file.* same subdirectory" \
-; do
-  test $(grep -c "$msg" stderr) -eq 1
-done
-
-# Guard against stupid typos.
-grep 'subdir-object([^s]|$)' stderr && exit 1
-
-$AUTOMAKE -Wno-unsupported
-
-echo AUTOMAKE_OPTIONS = subdir-objects >> Makefile.am
-AUTOMAKE_fails
-grep "^Makefile\.am" stderr && exit 1
-grep "^sub/Makefile\.am:.*'generic/b\.c'.* in a subdirectory" stderr
-grep "option 'subdir-objects' is disabled" stderr
-
-sed 's/^AM_INIT_AUTOMAKE/&([subdir-objects])/' configure.ac > configure.tmp
-mv -f configure.tmp configure.ac
-$ACLOCAL --force
-$AUTOMAKE
-
 rm -f compile
 $AUTOMAKE --add-missing 2>stderr || { cat stderr >&2; exit 1; }
 cat stderr >&2
diff --git a/t/subobj10.sh b/t/subobj10.sh
old mode 100755
new mode 100644
diff --git a/t/subobj11a.sh b/t/subobj11a.sh
old mode 100755
new mode 100644
diff --git a/t/subobj11b.sh b/t/subobj11b.sh
old mode 100755
new mode 100644
diff --git a/t/subobj11c.sh b/t/subobj11c.sh
old mode 100755
new mode 100644
diff --git a/t/subobj2.sh b/t/subobj2.sh
old mode 100755
new mode 100644
diff --git a/t/subobj4.sh b/t/subobj4.sh
deleted file mode 100755
index dbbed30..0000000
--- a/t/subobj4.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure '../foo/foo.cpp' generates a rule.
-# Report from Dave Brolley.
-
-. test-init.sh
-
-cat >> configure.ac << 'END'
-AC_PROG_CC
-AC_PROG_CXX
-AC_CONFIG_FILES([d1/Makefile d2/Makefile])
-AC_OUTPUT
-END
-
-mkdir d1 d2
-
-cat > Makefile.am << 'END'
-SUBDIRS = d1 d2
-END
-
-cat > d1/Makefile.am << 'END'
-bin_PROGRAMS = z
-z_SOURCES = ../d2/z.c
-END
-
-cat > d2/Makefile.am << 'END'
-END
-
-: > d2/z.c
-
-$ACLOCAL
-$AUTOMAKE -Wno-unsupported
-
-grep '\$(CC) .*\.\./d2/z\.c' d1/Makefile.in
-
-:
diff --git a/t/subobj5.sh b/t/subobj5.sh
old mode 100755
new mode 100644
diff --git a/t/subobj6.sh b/t/subobj6.sh
old mode 100755
new mode 100644
diff --git a/t/subobj7.sh b/t/subobj7.sh
old mode 100755
new mode 100644
diff --git a/t/subobj8.sh b/t/subobj8.sh
old mode 100755
new mode 100644
diff --git a/t/subobj9.sh b/t/subobj9.sh
old mode 100755
new mode 100644
diff --git a/t/subobjname.sh b/t/subobjname.sh
old mode 100755
new mode 100644
diff --git a/t/subpkg-macrodir.sh b/t/subpkg-macrodir.sh
old mode 100755
new mode 100644
diff --git a/t/subpkg-yacc.sh b/t/subpkg-yacc.sh
old mode 100755
new mode 100644
index 9fc6761..1fe50a5
--- a/t/subpkg-yacc.sh
+++ b/t/subpkg-yacc.sh
@@ -20,13 +20,17 @@
 required='cc yacc'
 . test-init.sh
 
-cat >>configure.ac <<'END'
+cat > configure.ac <<'END'
+AC_INIT([suya], [0.5a], address@hidden)
+AM_INIT_AUTOMAKE([foreign -Wall])
 AC_PROG_CC
+AC_CONFIG_FILES([Makefile])
 AC_CONFIG_SUBDIRS([lib])
 AC_OUTPUT
 END
 
 cat >Makefile.am <<'EOF'
+AUTOMAKE_OPTIONS = -Wno-override
 SUBDIRS = lib
 bin_PROGRAMS = MU
 MU_LDADD = lib/liblib.a
@@ -106,14 +110,18 @@ EOF
 
 $ACLOCAL
 $AUTOCONF
-$AUTOMAKE -Wno-override
+$AUTOMAKE
 
+test ! -e ylwrap
+test ! -e ar-lib
 cd lib
 $ACLOCAL
 $AUTOCONF
 $AUTOHEADER
-$AUTOMAKE -Wno-override --add-missing
+$AUTOMAKE --add-missing
 cd ..
+test -f ylwrap
+test -f ar-lib
 
 ./configure
 
diff --git a/t/subpkg.sh b/t/subpkg.sh
old mode 100755
new mode 100644
index f9cdc74..f1e3f2b
--- a/t/subpkg.sh
+++ b/t/subpkg.sh
@@ -23,7 +23,7 @@ mkdir m4
 
 cat >m4/foo.m4 <<'EOF'
 AC_DEFUN([FOO],[
-  AC_PROG_CC
+  AC_REQUIRE([AC_PROG_CC])
   AC_OUTPUT
 ])
 EOF
@@ -102,7 +102,10 @@ $AUTOHEADER
 $AUTOMAKE -Wno-override --add-missing
 cd ..
 
-./configure
+./configure >stdout || { cat stdout; exit 1; }
+cat stdout
+grep '^checking whether cc understands -c and -o together' stdout
+
 $MAKE
 $MAKE distcheck
 test ! -e subpack-1 # Make sure distcheck cleans up after itself.
diff --git a/t/subpkg2.sh b/t/subpkg2.sh
old mode 100755
new mode 100644
diff --git a/t/subpkg3.sh b/t/subpkg3.sh
old mode 100755
new mode 100644
diff --git a/t/subpkg4.sh b/t/subpkg4.sh
old mode 100755
new mode 100644
diff --git a/t/subst-no-trailing-empty-line.sh 
b/t/subst-no-trailing-empty-line.sh
old mode 100755
new mode 100644
diff --git a/t/subst.sh b/t/subst.sh
old mode 100755
new mode 100644
diff --git a/t/subst3.sh b/t/subst3.sh
old mode 100755
new mode 100644
diff --git a/t/subst4.sh b/t/subst4.sh
old mode 100755
new mode 100644
diff --git a/t/subst5.sh b/t/subst5.sh
old mode 100755
new mode 100644
diff --git a/t/substre2.sh b/t/substre2.sh
old mode 100755
new mode 100644
diff --git a/t/substref.sh b/t/substref.sh
old mode 100755
new mode 100644
diff --git a/t/substtarg.sh b/t/substtarg.sh
old mode 100755
new mode 100644
diff --git a/t/suffix-chain.tap b/t/suffix-chain.tap
old mode 100755
new mode 100644
diff --git a/t/suffix-custom-subobj-and-specflg.sh 
b/t/suffix-custom-subobj-and-specflg.sh
old mode 100755
new mode 100644
diff --git a/t/suffix-custom-subobj.sh b/t/suffix-custom-subobj.sh
old mode 100755
new mode 100644
diff --git a/t/suffix.sh b/t/suffix.sh
old mode 100755
new mode 100644
diff --git a/t/suffix10.tap b/t/suffix10.tap
old mode 100755
new mode 100644
diff --git a/t/suffix11.tap b/t/suffix11.tap
old mode 100755
new mode 100644
diff --git a/t/suffix2.sh b/t/suffix2.sh
old mode 100755
new mode 100644
diff --git a/t/suffix3.tap b/t/suffix3.tap
old mode 100755
new mode 100644
diff --git a/t/suffix4.sh b/t/suffix4.sh
old mode 100755
new mode 100644
diff --git a/t/suffix5.sh b/t/suffix5.sh
old mode 100755
new mode 100644
diff --git a/t/suffix6.sh b/t/suffix6.sh
old mode 100755
new mode 100644
diff --git a/t/suffix6b.sh b/t/suffix6b.sh
old mode 100755
new mode 100644
diff --git a/t/suffix6c.sh b/t/suffix6c.sh
old mode 100755
new mode 100644
index 353585d..00c6da3
--- a/t/suffix6c.sh
+++ b/t/suffix6c.sh
@@ -31,7 +31,7 @@ AC_SUBST([OBJEXT])
 AC_OUTPUT
 END
 
-unset OBJEXT || :
+unset OBJEXT
 
 cat > Makefile.am << 'END'
 SUFFIXES = .zoo .o .obj address@hidden@
diff --git a/t/suffix7.sh b/t/suffix7.sh
old mode 100755
new mode 100644
diff --git a/t/suffix8.tap b/t/suffix8.tap
old mode 100755
new mode 100644
diff --git a/t/suffix9.sh b/t/suffix9.sh
old mode 100755
new mode 100644
diff --git a/t/symlink.sh b/t/symlink.sh
old mode 100755
new mode 100644
diff --git a/t/symlink2.sh b/t/symlink2.sh
old mode 100755
new mode 100644
diff --git a/t/syntax.sh b/t/syntax.sh
old mode 100755
new mode 100644
diff --git a/t/tags-pr12372.sh b/t/tags-pr12372.sh
old mode 100755
new mode 100644
diff --git a/t/tags.sh b/t/tags.sh
old mode 100755
new mode 100644
diff --git a/t/tags2.sh b/t/tags2.sh
old mode 100755
new mode 100644
diff --git a/t/tagsub.sh b/t/tagsub.sh
old mode 100755
new mode 100644
diff --git a/t/tap-ambiguous-directive.sh b/t/tap-ambiguous-directive.sh
old mode 100755
new mode 100644
diff --git a/t/tap-autonumber.sh b/t/tap-autonumber.sh
old mode 100755
new mode 100644
diff --git a/t/tap-bad-prog.tap b/t/tap-bad-prog.tap
old mode 100755
new mode 100644
diff --git a/t/tap-bailout-and-logging.sh b/t/tap-bailout-and-logging.sh
old mode 100755
new mode 100644
diff --git a/t/tap-bailout-leading-space.sh b/t/tap-bailout-leading-space.sh
old mode 100755
new mode 100644
diff --git a/t/tap-bailout-suppress-badexit.sh 
b/t/tap-bailout-suppress-badexit.sh
old mode 100755
new mode 100644
diff --git a/t/tap-bailout-suppress-later-diagnostic.sh 
b/t/tap-bailout-suppress-later-diagnostic.sh
old mode 100755
new mode 100644
diff --git a/t/tap-bailout-suppress-later-errors.sh 
b/t/tap-bailout-suppress-later-errors.sh
old mode 100755
new mode 100644
diff --git a/t/tap-bailout.sh b/t/tap-bailout.sh
old mode 100755
new mode 100644
diff --git a/t/tap-basic.sh b/t/tap-basic.sh
old mode 100755
new mode 100644
diff --git a/t/tap-color.sh b/t/tap-color.sh
old mode 100755
new mode 100644
diff --git a/t/tap-common-setup.sh b/t/tap-common-setup.sh
old mode 100755
new mode 100644
diff --git a/t/tap-deps.sh b/t/tap-deps.sh
old mode 100755
new mode 100644
diff --git a/t/tap-diagnostic-custom.sh b/t/tap-diagnostic-custom.sh
old mode 100755
new mode 100644
diff --git a/t/tap-diagnostic.sh b/t/tap-diagnostic.sh
old mode 100755
new mode 100644
diff --git a/t/tap-doc.sh b/t/tap-doc.sh
old mode 100755
new mode 100644
diff --git a/t/tap-doc2.sh b/t/tap-doc2.sh
old mode 100755
new mode 100644
diff --git a/t/tap-driver-stderr.sh b/t/tap-driver-stderr.sh
old mode 100755
new mode 100644
diff --git a/t/tap-empty-diagnostic.sh b/t/tap-empty-diagnostic.sh
old mode 100755
new mode 100644
diff --git a/t/tap-empty.sh b/t/tap-empty.sh
old mode 100755
new mode 100644
diff --git a/t/tap-escape-directive-2.sh b/t/tap-escape-directive-2.sh
old mode 100755
new mode 100644
diff --git a/t/tap-escape-directive.sh b/t/tap-escape-directive.sh
old mode 100755
new mode 100644
diff --git a/t/tap-exit.sh b/t/tap-exit.sh
old mode 100755
new mode 100644
diff --git a/t/tap-fancy.sh b/t/tap-fancy.sh
old mode 100755
new mode 100644
diff --git a/t/tap-fancy2.sh b/t/tap-fancy2.sh
old mode 100755
new mode 100644
diff --git a/t/tap-global-log.sh b/t/tap-global-log.sh
old mode 100755
new mode 100644
diff --git a/t/tap-global-result.sh b/t/tap-global-result.sh
old mode 100755
new mode 100644
diff --git a/t/tap-log.sh b/t/tap-log.sh
old mode 100755
new mode 100644
diff --git a/t/tap-merge-stdout-stderr.sh b/t/tap-merge-stdout-stderr.sh
old mode 100755
new mode 100644
diff --git a/t/tap-missing-plan-and-bad-exit.sh 
b/t/tap-missing-plan-and-bad-exit.sh
old mode 100755
new mode 100644
diff --git a/t/tap-more.sh b/t/tap-more.sh
old mode 100755
new mode 100644
diff --git a/t/tap-more2.sh b/t/tap-more2.sh
old mode 100755
new mode 100644
diff --git a/t/tap-msg0-bailout.sh b/t/tap-msg0-bailout.sh
old mode 100755
new mode 100644
diff --git a/t/tap-msg0-directive.sh b/t/tap-msg0-directive.sh
old mode 100755
new mode 100644
diff --git a/t/tap-msg0-misc.sh b/t/tap-msg0-misc.sh
old mode 100755
new mode 100644
diff --git a/t/tap-msg0-planskip.sh b/t/tap-msg0-planskip.sh
old mode 100755
new mode 100644
diff --git a/t/tap-msg0-result.sh b/t/tap-msg0-result.sh
old mode 100755
new mode 100644
diff --git a/t/tap-negative-numbers.sh b/t/tap-negative-numbers.sh
old mode 100755
new mode 100644
diff --git a/t/tap-no-disable-hard-error.sh b/t/tap-no-disable-hard-error.sh
old mode 100755
new mode 100644
diff --git a/t/tap-no-merge-stdout-stderr.sh b/t/tap-no-merge-stdout-stderr.sh
old mode 100755
new mode 100644
diff --git a/t/tap-no-spurious-numbers.sh b/t/tap-no-spurious-numbers.sh
old mode 100755
new mode 100644
diff --git a/t/tap-no-spurious-summary.sh b/t/tap-no-spurious-summary.sh
old mode 100755
new mode 100644
diff --git a/t/tap-no-spurious.sh b/t/tap-no-spurious.sh
old mode 100755
new mode 100644
diff --git a/t/tap-not-ok-skip.sh b/t/tap-not-ok-skip.sh
old mode 100755
new mode 100644
diff --git a/t/tap-number-wordboundary.sh b/t/tap-number-wordboundary.sh
old mode 100755
new mode 100644
diff --git a/t/tap-numbers-leading-zero.sh b/t/tap-numbers-leading-zero.sh
old mode 100755
new mode 100644
diff --git a/t/tap-numeric-description.sh b/t/tap-numeric-description.sh
old mode 100755
new mode 100644
diff --git a/t/tap-out-of-order.sh b/t/tap-out-of-order.sh
old mode 100755
new mode 100644
diff --git a/t/tap-passthrough-exit.sh b/t/tap-passthrough-exit.sh
old mode 100755
new mode 100644
diff --git a/t/tap-passthrough.sh b/t/tap-passthrough.sh
old mode 100755
new mode 100644
diff --git a/t/tap-plan-corner.sh b/t/tap-plan-corner.sh
old mode 100755
new mode 100644
diff --git a/t/tap-plan-errors.sh b/t/tap-plan-errors.sh
old mode 100755
new mode 100644
diff --git a/t/tap-plan-leading-zero.sh b/t/tap-plan-leading-zero.sh
old mode 100755
new mode 100644
diff --git a/t/tap-plan-malformed.sh b/t/tap-plan-malformed.sh
old mode 100755
new mode 100644
diff --git a/t/tap-plan-middle.sh b/t/tap-plan-middle.sh
old mode 100755
new mode 100644
diff --git a/t/tap-plan-whitespace.sh b/t/tap-plan-whitespace.sh
old mode 100755
new mode 100644
diff --git a/t/tap-plan.sh b/t/tap-plan.sh
old mode 100755
new mode 100644
diff --git a/t/tap-planskip-and-logging.sh b/t/tap-planskip-and-logging.sh
old mode 100755
new mode 100644
diff --git a/t/tap-planskip-badexit.sh b/t/tap-planskip-badexit.sh
old mode 100755
new mode 100644
diff --git a/t/tap-planskip-bailout.sh b/t/tap-planskip-bailout.sh
old mode 100755
new mode 100644
diff --git a/t/tap-planskip-case-insensitive.sh 
b/t/tap-planskip-case-insensitive.sh
old mode 100755
new mode 100644
diff --git a/t/tap-planskip-late.sh b/t/tap-planskip-late.sh
old mode 100755
new mode 100644
diff --git a/t/tap-planskip-later-errors.sh b/t/tap-planskip-later-errors.sh
old mode 100755
new mode 100644
diff --git a/t/tap-planskip-unplanned-corner.sh 
b/t/tap-planskip-unplanned-corner.sh
old mode 100755
new mode 100644
diff --git a/t/tap-planskip-unplanned.sh b/t/tap-planskip-unplanned.sh
old mode 100755
new mode 100644
diff --git a/t/tap-planskip-whitespace.sh b/t/tap-planskip-whitespace.sh
old mode 100755
new mode 100644
diff --git a/t/tap-planskip.sh b/t/tap-planskip.sh
old mode 100755
new mode 100644
diff --git a/t/tap-realtime.sh b/t/tap-realtime.sh
old mode 100755
new mode 100644
diff --git a/t/tap-recheck-logs.sh b/t/tap-recheck-logs.sh
old mode 100755
new mode 100644
diff --git a/t/tap-recheck.sh b/t/tap-recheck.sh
old mode 100755
new mode 100644
diff --git a/t/tap-result-comment.sh b/t/tap-result-comment.sh
old mode 100755
new mode 100644
diff --git a/t/tap-signal.tap b/t/tap-signal.tap
old mode 100755
new mode 100644
diff --git a/t/tap-summary-color.sh b/t/tap-summary-color.sh
old mode 100755
new mode 100644
diff --git a/t/tap-summary.sh b/t/tap-summary.sh
old mode 100755
new mode 100644
diff --git a/t/tap-test-number-0.sh b/t/tap-test-number-0.sh
old mode 100755
new mode 100644
diff --git a/t/tap-todo-skip-together.sh b/t/tap-todo-skip-together.sh
old mode 100755
new mode 100644
diff --git a/t/tap-todo-skip-whitespace.sh b/t/tap-todo-skip-whitespace.sh
old mode 100755
new mode 100644
diff --git a/t/tap-todo-skip.sh b/t/tap-todo-skip.sh
old mode 100755
new mode 100644
diff --git a/t/tap-unplanned.sh b/t/tap-unplanned.sh
old mode 100755
new mode 100644
diff --git a/t/tap-whitespace-normalization.sh 
b/t/tap-whitespace-normalization.sh
old mode 100755
new mode 100644
diff --git a/t/tap-with-and-without-number.sh b/t/tap-with-and-without-number.sh
old mode 100755
new mode 100644
diff --git a/t/tap-xfail-tests.sh b/t/tap-xfail-tests.sh
old mode 100755
new mode 100644
diff --git a/t/tar-opts-errors.sh b/t/tar-opts-errors.sh
old mode 100755
new mode 100644
diff --git a/t/tar-override.sh b/t/tar-override.sh
old mode 100755
new mode 100644
index bbf3fbb..d5bbd56
--- 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
old mode 100755
new mode 100644
diff --git a/t/tar-ustar-id-too-high.sh b/t/tar-ustar-id-too-high.sh
old mode 100755
new mode 100644
diff --git a/t/tar-ustar.sh b/t/tar-ustar.sh
old mode 100755
new mode 100644
diff --git a/t/target-cflags.sh b/t/target-cflags.sh
old mode 100755
new mode 100644
diff --git a/t/targetclash.sh b/t/targetclash.sh
old mode 100755
new mode 100644
diff --git a/t/test-driver-acsubst.sh b/t/test-driver-acsubst.sh
old mode 100755
new mode 100644
diff --git a/t/test-driver-cond.sh b/t/test-driver-cond.sh
old mode 100755
new mode 100644
diff --git a/t/test-driver-create-log-dir.sh b/t/test-driver-create-log-dir.sh
old mode 100755
new mode 100644
diff --git a/t/test-driver-custom-multitest-recheck.sh 
b/t/test-driver-custom-multitest-recheck.sh
old mode 100755
new mode 100644
diff --git a/t/test-driver-custom-multitest-recheck2.sh 
b/t/test-driver-custom-multitest-recheck2.sh
old mode 100755
new mode 100644
diff --git a/t/test-driver-custom-multitest.sh 
b/t/test-driver-custom-multitest.sh
old mode 100755
new mode 100644
diff --git a/t/test-driver-custom-no-extra-driver.sh 
b/t/test-driver-custom-no-extra-driver.sh
old mode 100755
new mode 100644
diff --git a/t/test-driver-custom-xfail-tests.sh 
b/t/test-driver-custom-xfail-tests.sh
old mode 100755
new mode 100644
diff --git a/t/test-driver-custom.sh b/t/test-driver-custom.sh
old mode 100755
new mode 100644
diff --git a/t/test-driver-fail.sh b/t/test-driver-fail.sh
old mode 100755
new mode 100644
diff --git a/t/test-driver-is-distributed.sh b/t/test-driver-is-distributed.sh
old mode 100755
new mode 100644
diff --git a/t/test-driver-strip-vpath.sh b/t/test-driver-strip-vpath.sh
old mode 100755
new mode 100644
diff --git a/t/test-driver-trs-suffix-registered.sh 
b/t/test-driver-trs-suffix-registered.sh
old mode 100755
new mode 100644
diff --git a/t/test-extensions-cond.sh b/t/test-extensions-cond.sh
old mode 100755
new mode 100644
diff --git a/t/test-extensions.sh b/t/test-extensions.sh
old mode 100755
new mode 100644
diff --git a/t/test-harness-vpath-rewrite.sh b/t/test-harness-vpath-rewrite.sh
old mode 100755
new mode 100644
diff --git a/t/test-log.sh b/t/test-log.sh
old mode 100755
new mode 100644
diff --git a/t/test-logs-repeated.sh b/t/test-logs-repeated.sh
old mode 100755
new mode 100644
diff --git a/t/test-metadata-global-log.sh b/t/test-metadata-global-log.sh
old mode 100755
new mode 100644
diff --git a/t/test-metadata-global-result.sh b/t/test-metadata-global-result.sh
old mode 100755
new mode 100644
diff --git a/t/test-metadata-recheck.sh b/t/test-metadata-recheck.sh
old mode 100755
new mode 100644
diff --git a/t/test-metadata-results.sh b/t/test-metadata-results.sh
old mode 100755
new mode 100644
diff --git a/t/test-missing.sh b/t/test-missing.sh
old mode 100755
new mode 100644
diff --git a/t/test-missing2.sh b/t/test-missing2.sh
old mode 100755
new mode 100644
diff --git a/t/test-trs-basic.sh b/t/test-trs-basic.sh
old mode 100755
new mode 100644
diff --git a/t/test-trs-recover.sh b/t/test-trs-recover.sh
old mode 100755
new mode 100644
diff --git a/t/test-trs-recover2.sh b/t/test-trs-recover2.sh
old mode 100755
new mode 100644
diff --git a/t/tests-environment-and-log-compiler.sh 
b/t/tests-environment-and-log-compiler.sh
old mode 100755
new mode 100644
index 283e7d3..5f0e2f5
--- 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
old mode 100755
new mode 100644
diff --git a/t/tests-environment-fd-redirect.sh 
b/t/tests-environment-fd-redirect.sh
old mode 100755
new mode 100644
diff --git a/t/tests-environment.sh b/t/tests-environment.sh
old mode 100755
new mode 100644
diff --git a/t/testsuite-summary-color.sh b/t/testsuite-summary-color.sh
old mode 100755
new mode 100644
diff --git a/t/testsuite-summary-count-many.sh 
b/t/testsuite-summary-count-many.sh
old mode 100755
new mode 100644
diff --git a/t/testsuite-summary-count.sh b/t/testsuite-summary-count.sh
old mode 100755
new mode 100644
diff --git a/t/testsuite-summary-reference-log.sh 
b/t/testsuite-summary-reference-log.sh
old mode 100755
new mode 100644
diff --git a/t/transform.sh b/t/transform.sh
old mode 100755
new mode 100644
diff --git a/t/transform2.sh b/t/transform2.sh
old mode 100755
new mode 100644
diff --git a/t/transform3.sh b/t/transform3.sh
old mode 100755
new mode 100644
diff --git a/t/txinfo-absolute-srcdir-pr408.sh 
b/t/txinfo-absolute-srcdir-pr408.sh
old mode 100755
new mode 100644
diff --git a/t/txinfo-add-missing-and-dist.sh b/t/txinfo-add-missing-and-dist.sh
old mode 100755
new mode 100644
diff --git a/t/txinfo-bsd-make-recurs.sh b/t/txinfo-bsd-make-recurs.sh
old mode 100755
new mode 100644
diff --git a/t/txinfo-builddir.sh b/t/txinfo-builddir.sh
old mode 100755
new mode 100644
diff --git a/t/txinfo-clean.sh b/t/txinfo-clean.sh
old mode 100755
new mode 100644
diff --git a/t/txinfo-dvi-recurs.sh b/t/txinfo-dvi-recurs.sh
old mode 100755
new mode 100644
diff --git a/t/txinfo-info-in-srcdir.sh b/t/txinfo-info-in-srcdir.sh
old mode 100755
new mode 100644
diff --git a/t/txinfo-makeinfo-error-no-clobber.sh 
b/t/txinfo-makeinfo-error-no-clobber.sh
old mode 100755
new mode 100644
diff --git a/t/txinfo-many-output-formats-vpath.sh 
b/t/txinfo-many-output-formats-vpath.sh
old mode 100755
new mode 100644
diff --git a/t/txinfo-many-output-formats.sh b/t/txinfo-many-output-formats.sh
old mode 100755
new mode 100644
diff --git a/t/txinfo-no-clutter.sh b/t/txinfo-no-clutter.sh
old mode 100755
new mode 100644
diff --git a/t/txinfo-no-extra-dist.sh b/t/txinfo-no-extra-dist.sh
old mode 100755
new mode 100644
diff --git a/t/txinfo-no-installinfo.sh b/t/txinfo-no-installinfo.sh
old mode 100755
new mode 100644
diff --git a/t/txinfo-no-repeated-targets.sh b/t/txinfo-no-repeated-targets.sh
old mode 100755
new mode 100644
diff --git a/t/txinfo-no-split.sh b/t/txinfo-no-split.sh
old mode 100755
new mode 100644
diff --git a/t/txinfo-nodist-info.sh b/t/txinfo-nodist-info.sh
old mode 100755
new mode 100644
diff --git a/t/txinfo-other-suffixes.sh b/t/txinfo-other-suffixes.sh
old mode 100755
new mode 100644
diff --git a/t/txinfo-override-infodeps.sh b/t/txinfo-override-infodeps.sh
old mode 100755
new mode 100644
diff --git a/t/txinfo-override-texinfo-tex.sh b/t/txinfo-override-texinfo-tex.sh
old mode 100755
new mode 100644
diff --git a/t/txinfo-setfilename-repeated.sh b/t/txinfo-setfilename-repeated.sh
old mode 100755
new mode 100644
diff --git a/t/txinfo-setfilename-suffix-strip.sh 
b/t/txinfo-setfilename-suffix-strip.sh
old mode 100755
new mode 100644
diff --git a/t/txinfo-subdir-pr343.sh b/t/txinfo-subdir-pr343.sh
old mode 100755
new mode 100644
diff --git a/t/txinfo-tex-dist.sh b/t/txinfo-tex-dist.sh
old mode 100755
new mode 100644
diff --git a/t/txinfo-unrecognized-extension.sh 
b/t/txinfo-unrecognized-extension.sh
old mode 100755
new mode 100644
diff --git a/t/txinfo-unrecognized-info-suffix.sh 
b/t/txinfo-unrecognized-info-suffix.sh
old mode 100755
new mode 100644
diff --git a/t/txinfo-vtexi.sh b/t/txinfo-vtexi.sh
old mode 100755
new mode 100644
diff --git a/t/txinfo-vtexi2.sh b/t/txinfo-vtexi2.sh
old mode 100755
new mode 100644
diff --git a/t/txinfo-vtexi3.sh b/t/txinfo-vtexi3.sh
old mode 100755
new mode 100644
diff --git a/t/txinfo-vtexi4.sh b/t/txinfo-vtexi4.sh
old mode 100755
new mode 100644
diff --git a/t/txinfo-without-info-suffix.sh b/t/txinfo-without-info-suffix.sh
old mode 100755
new mode 100644
diff --git a/t/txinfo23.sh b/t/txinfo23.sh
old mode 100755
new mode 100644
diff --git a/t/txinfo24.sh b/t/txinfo24.sh
old mode 100755
new mode 100644
diff --git a/t/txinfo25.sh b/t/txinfo25.sh
old mode 100755
new mode 100644
diff --git a/t/txinfo28.sh b/t/txinfo28.sh
old mode 100755
new mode 100644
diff --git a/t/uninstall-fail.sh b/t/uninstall-fail.sh
old mode 100755
new mode 100644
diff --git a/t/uninstall-pr9578.sh b/t/uninstall-pr9578.sh
old mode 100755
new mode 100644
diff --git a/t/unused.sh b/t/unused.sh
old mode 100755
new mode 100644
diff --git a/t/upc.sh b/t/upc.sh
old mode 100755
new mode 100644
diff --git a/t/upc2.sh b/t/upc2.sh
old mode 100755
new mode 100644
diff --git a/t/upc3.sh b/t/upc3.sh
old mode 100755
new mode 100644
diff --git a/t/vala-configure.sh b/t/vala-configure.sh
old mode 100755
new mode 100644
index cbba4bd..4f59d07
--- 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
old mode 100755
new mode 100644
diff --git a/t/vala-headers.sh b/t/vala-headers.sh
old mode 100755
new mode 100644
diff --git a/t/vala-libs.sh b/t/vala-libs.sh
old mode 100755
new mode 100644
diff --git a/t/vala-mix.sh b/t/vala-mix.sh
old mode 100755
new mode 100644
diff --git a/t/vala-mix2.sh b/t/vala-mix2.sh
old mode 100755
new mode 100644
diff --git a/t/vala-non-recursive-setup.sh b/t/vala-non-recursive-setup.sh
old mode 100755
new mode 100644
diff --git a/t/vala-parallel.sh b/t/vala-parallel.sh
old mode 100755
new mode 100644
diff --git a/t/vala-per-target-flags.sh b/t/vala-per-target-flags.sh
old mode 100755
new mode 100644
diff --git a/t/vala-recursive-setup.sh b/t/vala-recursive-setup.sh
old mode 100755
new mode 100644
diff --git a/t/vala-vapi.sh b/t/vala-vapi.sh
old mode 100755
new mode 100644
diff --git a/t/vala-vpath.sh b/t/vala-vpath.sh
old mode 100755
new mode 100644
diff --git a/t/var-recurs.sh b/t/var-recurs.sh
old mode 100755
new mode 100644
diff --git a/t/var-recurs2.sh b/t/var-recurs2.sh
old mode 100755
new mode 100644
diff --git a/t/vars.sh b/t/vars.sh
old mode 100755
new mode 100644
diff --git a/t/vars3.sh b/t/vars3.sh
old mode 100755
new mode 100644
diff --git a/t/vartar.sh b/t/vartar.sh
old mode 100755
new mode 100644
diff --git a/t/vartypo2.sh b/t/vartypo2.sh
old mode 100755
new mode 100644
diff --git a/t/vartypos.sh b/t/vartypos.sh
old mode 100755
new mode 100644
diff --git a/t/version3.sh b/t/version3.sh
old mode 100755
new mode 100644
diff --git a/t/version4.sh b/t/version4.sh
old mode 100755
new mode 100644
diff --git a/t/version6.sh b/t/version6.sh
old mode 100755
new mode 100644
diff --git a/t/version7.sh b/t/version7.sh
old mode 100755
new mode 100644
diff --git a/t/version8.sh b/t/version8.sh
old mode 100755
new mode 100644
diff --git a/t/vpath.sh b/t/vpath.sh
old mode 100755
new mode 100644
diff --git a/t/warning-groups-win-over-strictness.sh 
b/t/warning-groups-win-over-strictness.sh
old mode 100755
new mode 100644
diff --git a/t/warnings-obsolete-default.sh b/t/warnings-obsolete-default.sh
old mode 100755
new mode 100644
diff --git a/t/warnings-override.sh b/t/warnings-override.sh
old mode 100755
new mode 100644
diff --git a/t/warnings-precedence.sh b/t/warnings-precedence.sh
old mode 100755
new mode 100644
diff --git a/t/warnings-strictness-interactions.sh 
b/t/warnings-strictness-interactions.sh
old mode 100755
new mode 100644
diff --git a/t/warnings-unknown.sh b/t/warnings-unknown.sh
old mode 100755
new mode 100644
diff --git a/t/warnings-win-over-strictness.sh 
b/t/warnings-win-over-strictness.sh
old mode 100755
new mode 100644
diff --git a/t/warnopts.sh b/t/warnopts.sh
old mode 100755
new mode 100644
diff --git a/t/werror.sh b/t/werror.sh
old mode 100755
new mode 100644
diff --git a/t/werror2.sh b/t/werror2.sh
old mode 100755
new mode 100644
diff --git a/t/werror3.sh b/t/werror3.sh
old mode 100755
new mode 100644
index c6007c8..c1ec28a
--- a/t/werror3.sh
+++ b/t/werror3.sh
@@ -36,7 +36,7 @@ END
 $ACLOCAL
 
 # The issue would not manifest with threaded execution.
-unset AUTOMAKE_JOBS || :
+unset AUTOMAKE_JOBS
 AUTOMAKE_run -Wno-error
 grep 'VAR multiply defined' stderr
 
diff --git a/t/werror4.sh b/t/werror4.sh
old mode 100755
new mode 100644
diff --git a/t/whoami.sh b/t/whoami.sh
old mode 100755
new mode 100644
diff --git a/t/xsource.sh b/t/xsource.sh
old mode 100755
new mode 100644
index a3fe6e5..70dfd4e
--- a/t/xsource.sh
+++ b/t/xsource.sh
@@ -21,18 +21,22 @@
 
 cat > Makefile.am << 'END'
 bin_PROGRAMS = zardoz
-zardoz_SOURCES = z.c x/z.c
+lib_LTLIBRARIES = libfoo.la
+zardoz_SOURCES = z.c
+libfoo_la_SOURCES = z.c
 END
 
+: > ltmain.sh
+: > config.guess
+: > config.sub
+
 cat >> configure.ac << 'END'
 AC_PROG_CC
+AC_SUBST([LIBTOOL], [unused])
 END
 
-mkdir x
-
-: > z.c
-: > x/z.c
-
 $ACLOCAL
 AUTOMAKE_fails
-$FGREP 'z.$(OBJEXT)' stderr
+$FGREP "object 'z.\$(OBJEXT)' created both with libtool and without" stderr
+
+:
diff --git a/t/yacc-auxdir.sh b/t/yacc-auxdir.sh
old mode 100755
new mode 100644
diff --git a/t/yacc-basic.sh b/t/yacc-basic.sh
old mode 100755
new mode 100644
diff --git a/t/yacc-bison-skeleton-cxx.sh b/t/yacc-bison-skeleton-cxx.sh
old mode 100755
new mode 100644
diff --git a/t/yacc-bison-skeleton.sh b/t/yacc-bison-skeleton.sh
old mode 100755
new mode 100644
diff --git a/t/yacc-clean-cxx.sh b/t/yacc-clean-cxx.sh
old mode 100755
new mode 100644
diff --git a/t/yacc-clean.sh b/t/yacc-clean.sh
old mode 100755
new mode 100644
diff --git a/t/yacc-cxx-grepping.sh b/t/yacc-cxx-grepping.sh
old mode 100755
new mode 100644
diff --git a/t/yacc-cxx.sh b/t/yacc-cxx.sh
old mode 100755
new mode 100644
diff --git a/t/yacc-d-basic.sh b/t/yacc-d-basic.sh
old mode 100755
new mode 100644
diff --git a/t/yacc-d-cxx.sh b/t/yacc-d-cxx.sh
old mode 100755
new mode 100644
diff --git a/t/yacc-d-vpath.sh b/t/yacc-d-vpath.sh
old mode 100755
new mode 100644
diff --git a/t/yacc-deleted-headers.sh b/t/yacc-deleted-headers.sh
old mode 100755
new mode 100644
diff --git a/t/yacc-depend.sh b/t/yacc-depend.sh
old mode 100755
new mode 100644
diff --git a/t/yacc-depend2.sh b/t/yacc-depend2.sh
old mode 100755
new mode 100644
diff --git a/t/yacc-dist-nobuild-subdir.sh b/t/yacc-dist-nobuild-subdir.sh
old mode 100755
new mode 100644
diff --git a/t/yacc-dist-nobuild.sh b/t/yacc-dist-nobuild.sh
old mode 100755
new mode 100644
diff --git a/t/yacc-dry.sh b/t/yacc-dry.sh
old mode 100755
new mode 100644
diff --git a/t/yacc-grepping.sh b/t/yacc-grepping.sh
old mode 100755
new mode 100644
diff --git a/t/yacc-grepping2.sh b/t/yacc-grepping2.sh
old mode 100755
new mode 100644
index 3c5da22..eb4afed
--- a/t/yacc-grepping2.sh
+++ b/t/yacc-grepping2.sh
@@ -24,57 +24,33 @@ AC_PROG_CC
 AC_PROG_YACC
 END
 
-cat > Makefile.am << 'END'
-bin_PROGRAMS = maude
-maude_SOURCES = sub/maude.y
-END
-
-mkdir sub
-
-: > sub/maude.y
-
 $ACLOCAL
-# FIXME: stop disabling the warnings in the 'unsupported' category
-# FIXME: once the 'subdir-objects' option has been mandatory.
-$AUTOMAKE -a -Wno-unsupported
-
-grep '^maude\.c:.*maude\.y' Makefile.in
-
-
-## Try again with subdir-objects.
 
 cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = subdir-objects
 bin_PROGRAMS = maude
 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
 
-
 ## Try again with per-exe flags.
 
 cat > Makefile.am << 'END'
 bin_PROGRAMS = maude
 maude_SOURCES = sub/maude.y
-## A particularly trickey case.
+## A particularly tricky case.
 maude_YFLAGS = -d
 END
 
-# FIXME: stop disabling the warnings in the 'unsupported' category
-# FIXME: once the 'subdir-objects' option has been mandatory.
-$AUTOMAKE -a -Wno-unsupported
-
+$AUTOMAKE -a
+grep '^sub/maude-maude\.c:.*sub/maude\.y' Makefile.in
 # Rule should use maude_YFLAGS.
 grep 'AM_YFLAGS.*maude' Makefile.in && exit 1
-
 # Silly regression.
 grep 'maudec' Makefile.in && exit 1
-
 # Make sure the .o file is required.
 grep '^am_maude_OBJECTS.*maude' Makefile.in
 
diff --git a/t/yacc-headers-and-dist-pr47.sh b/t/yacc-headers-and-dist-pr47.sh
old mode 100755
new mode 100644
diff --git a/t/yacc-line.sh b/t/yacc-line.sh
old mode 100755
new mode 100644
index b034af3..d0c6300
--- a/t/yacc-line.sh
+++ b/t/yacc-line.sh
@@ -15,43 +15,26 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Check that automake yacc support ensures that yacc-generated C
-# files use correct "#line" directives.  Try also with the
-# 'subdir-object' option enabled.
-# See also sister test 'lex-line.sh'.
+# files use correct "#line" directives.
+# See also sister test 'lex-line.test'.
 
 required='cc yacc'
 . test-init.sh
 
 cat >> configure.ac << 'END'
-AC_CONFIG_FILES([sub/Makefile])
 AC_PROG_CC
 AC_PROG_YACC
 AC_OUTPUT
 END
 
-mkdir dir sub sub/dir
+mkdir dir
 
 cat > Makefile.am << 'END'
-SUBDIRS = sub
-bin_PROGRAMS = foo bar
-AM_YFLAGS = -d
-bar_YFLAGS =
+noinst_PROGRAMS = foo bar baz
+baz_YFLAGS = -d
 foo_SOURCES = zardoz.y
 bar_SOURCES = dir/quux.y
-## Avoid spurious failures with Solaris make.
address@hidden@: zardoz.c
address@hidden@: bar-quux.c
-END
-
-cat > sub/Makefile.am << 'END'
-AUTOMAKE_OPTIONS = subdir-objects
-noinst_PROGRAMS = foo bar
-foo_YFLAGS = -d
-foo_SOURCES = zardoz.y
-bar_SOURCES = dir/quux.y
-## Avoid spurious failures with Solaris make.
address@hidden@: foo-zardoz.c
-dir/address@hidden@: dir/quux.c
+baz_SOURCES = zardoz.y
 END
 
 cat > zardoz.y << 'END'
@@ -69,10 +52,8 @@ int main(void)
 END
 
 cp zardoz.y dir/quux.y
-cp zardoz.y sub/zardoz.y
-cp zardoz.y sub/dir/quux.y
 
-c_outputs='zardoz.c bar-quux.c sub/foo-zardoz.c sub/dir/quux.c'
+c_outputs='zardoz.c dir/quux.c baz-zardoz.c'
 
 $ACLOCAL
 $AUTOCONF
@@ -94,7 +75,7 @@ for vpath in : false; do
   $MAKE
 
   # For debugging,
-  ls -l . sub sub/dir
+  ls -l . dir
   $EGREP 'line|\.y' $c_outputs
 
   # Adjusted "#line" should not contain reference to the builddir.
@@ -109,14 +90,12 @@ for vpath in : false; do
   grep "#.*\.y.*\.y" $c_outputs && exit 1
   if $vpath; then
     grep '#.*line.*"\.\./zardoz\.y"' zardoz.c
-    grep '#.*line.*"\.\./dir/quux\.y"' bar-quux.c
-    grep '#.*line.*"\.\./\.\./sub/zardoz\.y"' sub/foo-zardoz.c
-    grep '#.*line.*"\.\./\.\./sub/dir/quux\.y"' sub/dir/quux.c
+    grep '#.*line.*"\.\./zardoz\.y"' baz-zardoz.c
+    grep '#.*line.*"\.\./dir/quux\.y"' dir/quux.c
   else
     grep '#.*line.*"zardoz\.y"' zardoz.c
-    grep '#.*line.*"dir/quux\.y"' bar-quux.c
-    grep '#.*line.*"zardoz\.y"' sub/foo-zardoz.c
-    grep '#.*line.*"dir/quux\.y"' sub/dir/quux.c
+    grep '#.*line.*"zardoz\.y"' baz-zardoz.c
+    grep '#.*line.*"dir/quux\.y"' dir/quux.c
   fi
 
   cd $srcdir
diff --git a/t/yacc-misc.sh b/t/yacc-misc.sh
old mode 100755
new mode 100644
diff --git a/t/yacc-mix-c-cxx.sh b/t/yacc-mix-c-cxx.sh
old mode 100755
new mode 100644
diff --git a/t/yacc-nodist.sh b/t/yacc-nodist.sh
old mode 100755
new mode 100644
diff --git a/t/yacc-pr204.sh b/t/yacc-pr204.sh
old mode 100755
new mode 100644
diff --git a/t/yacc-subdir.sh b/t/yacc-subdir.sh
old mode 100755
new mode 100644
diff --git a/t/yacc-vpath.sh b/t/yacc-vpath.sh
old mode 100755
new mode 100644
diff --git a/t/yacc-weirdnames.sh b/t/yacc-weirdnames.sh
old mode 100755
new mode 100644
diff --git a/t/yflags-cmdline-override.sh b/t/yflags-cmdline-override.sh
old mode 100755
new mode 100644
index 613c35c..3eea823
--- 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
old mode 100755
new mode 100644
diff --git a/t/yflags-d-false-positives.sh b/t/yflags-d-false-positives.sh
old mode 100755
new mode 100644
diff --git a/t/yflags-force-conditional.sh b/t/yflags-force-conditional.sh
old mode 100755
new mode 100644
diff --git a/t/yflags-force-override.sh b/t/yflags-force-override.sh
old mode 100755
new mode 100644
diff --git a/t/yflags-var-expand.sh b/t/yflags-var-expand.sh
old mode 100755
new mode 100644
diff --git a/t/yflags.sh b/t/yflags.sh
old mode 100755
new mode 100644
index 8d17dc8..f8fe7a4
--- a/t/yflags.sh
+++ b/t/yflags.sh
@@ -30,7 +30,7 @@ chmod a+x fake-yacc
 
 # Remove Yacc from the environment, so that it won't interfere
 # with 'make -e' below.
-unset YACC || :
+unset YACC
 
 cat >> configure.ac <<'END'
 AC_SUBST([CC], [false])
diff --git a/t/yflags2.sh b/t/yflags2.sh
old mode 100755
new mode 100644
index 37dce3f..12eb5d7
--- a/t/yflags2.sh
+++ b/t/yflags2.sh
@@ -30,7 +30,7 @@ chmod a+x fake-yacc
 
 # Remove Yacc from the environment, so that it won't interfere
 # with 'make -e' below.
-unset YACC || :
+unset YACC
 
 cat >> configure.ac <<'END'
 AC_SUBST([CXX], [false])


hooks/post-receive
-- 
GNU Automake



reply via email to

[Prev in Thread] Current Thread [Next in Thread]