From MAILER-DAEMON Wed Jan 01 18:28:01 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VyVCj-0001qq-Qe
	for mharc-libtool-commit@gnu.org; Wed, 01 Jan 2014 18:28:01 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:41274)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VyVCW-0001qh-3r
	for libtool-commit@gnu.org; Wed, 01 Jan 2014 18:28:00 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VyVCK-0003WA-H0
	for libtool-commit@gnu.org; Wed, 01 Jan 2014 18:27:48 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:50916)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VyVCK-0003W3-8E
	for libtool-commit@gnu.org; Wed, 01 Jan 2014 18:27:36 -0500
Received: from gary by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VyVCI-0004wP-BY
	for libtool-commit@gnu.org; Wed, 01 Jan 2014 23:27:35 +0000
Date: Wed, 01 Jan 2014 23:27:34 +0000
Message-Id: <E1VyVCI-0004wP-BY@vcs.savannah.gnu.org>
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
Subject: [SCM] GNU Libtool branch, master, updated. v2.4.2.418-26-ga4ffcdb
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 4494446e43ccd60c1e91a707584841705d28e338
X-Git-Newrev: a4ffcdb5e0f207656bb2584b1c4e1702a6d7fa32
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Jan 2014 23:28:00 -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 Libtool".

The branch, master has been updated
       via  a4ffcdb5e0f207656bb2584b1c4e1702a6d7fa32 (commit)
       via  d695e72b7467c4bac13d631d36532488372da406 (commit)
       via  0955ed3ca4eab40d8740f28a0b7322b77bdcd8f3 (commit)
       via  11ab8f1f63cb35b1da289191eb7a1dadc57dd8bf (commit)
       via  564d58222c58acaabf435a99d5e0acf32572bbe6 (commit)
       via  8d285ed54b9b9b307e8fe1a25ba9e624eab93b8d (commit)
       via  7f99bfd86c97038b73a1e5d1445ef31c6ec59983 (commit)
       via  0e1ba2182cbbae47d5da09984c776774ab2616ea (commit)
       via  747c60634e269ecf740254d86f4a4a2500c20524 (commit)
       via  cc189e7daf95b91d22c585b2cdf6b787c8e3c3c6 (commit)
       via  83405160afeb97ffd4430fd37c8edd7eeb703366 (commit)
       via  3050db962c61ea81d67f90e33135a668650f5fe0 (commit)
       via  24be64322deed74bec35893143fcd28494c570cd (commit)
       via  9cb8bb6d065f0453abea50b35e7bbd4c4598a52b (commit)
       via  4e373ebe1308473a47ae1ba9da291a505184a9cb (commit)
      from  4494446e43ccd60c1e91a707584841705d28e338 (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 a4ffcdb5e0f207656bb2584b1c4e1702a6d7fa32
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Thu Jan 2 12:13:13 2014 +1300

    libtool: only strip -Wl when linking with $LD.
    
    * build-aux/ltmain.in (func_mode_link): Don't strip -Wl from the
    linker flags, except when linking with $LD, otherwise compiler
    drivers that don't recognize and pass linker flags through will
    choke on unrecognized options.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

commit d695e72b7467c4bac13d631d36532488372da406
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Thu Jan 2 11:58:35 2014 +1300

    bootstrap: fix gitlog-to-changelog detection.
    
    * gl/build-aux/bootstrap.in (func_ifcontains): Use a for loop
    that relies on $IFS for element splitting instead of a one-shot
    case glob that is not tolerant to \n in $gnulib_modules.
    * THANKS: Add Reuben Thomas.
    Reported by Reuben Thomas
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

commit 0955ed3ca4eab40d8740f28a0b7322b77bdcd8f3
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Thu Jan 2 11:45:36 2014 +1300

    maint: update copyright notices to include 2014.
    
    * .x-update-copyright: New file. Exclude files not owned by this
    project from update-copyright rules.
    * doc/libtool.texi: Replace m-dash with n-dash in texinfo
    copyright notice so that update-copyright matches correctly.
    Undo bogus copyright updates to example output from gdb session.
    Bump copyright year.
    * Changelog.old: Revert bogus updates from previous years
    without .x-update-copyright.
    AUTHORS, HACKING, Makefile.am, NEWS, README, THANKS, TODO,
    bootstrap, bootstrap.conf, build-aux/edit-readme-alpha,
    build-aux/git-hooks/commit-msg, build-aux/ltmain.in, cfg.mk,
    configure.ac, gl/build-aux/bootstrap.in,
    gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
    gl/build-aux/inline-source, gl/build-aux/options-parser,
    libltdl/README, libltdl/argz.c, libltdl/argz_.h,
    libltdl/configure.ac, libltdl/libltdl/lt__alloc.h,
    libltdl/libltdl/lt__dirent.h, libltdl/libltdl/lt__glibc.h,
    libltdl/libltdl/lt__private.h, libltdl/libltdl/lt__strl.h,
    libltdl/libltdl/lt_dlloader.h, libltdl/libltdl/lt_error.h,
    libltdl/libltdl/lt_system.h, libltdl/libltdl/slist.h,
    libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
    libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
    libltdl/loaders/loadlibrary.c, libltdl/loaders/preopen.c,
    libltdl/loaders/shl_load.c, libltdl/lt__alloc.c,
    libltdl/lt__dirent.c, libltdl/lt__strl.c, libltdl/lt_dlloader.c,
    libltdl/lt_error.c, libltdl/ltdl.c, libltdl/ltdl.h,
    libltdl/ltdl.mk, libltdl/slist.c, libtoolize.in, m4/argz.m4,
    m4/autobuild.m4, m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4,
    m4/ltsugar.m4, m4/ltversion.in, m4/lt~obsolete.m4,
    tests/am-subdir.at, tests/archive-in-archive.at,
    tests/bindir.at, tests/cdemo.at, tests/cmdline_wrap.at,
    tests/configure-iface.at, tests/convenience.at, tests/ctor.at,
    tests/cwrapper.at, tests/darwin.at, tests/demo.at,
    tests/depdemo.at, tests/deplib-in-subdir.at,
    tests/deplibs-ident.at, tests/deplibs-mingw.at,
    tests/destdir.at, tests/dlloader-api.at,
    tests/dumpbin-symbols.at, tests/duplicate_conv.at,
    tests/duplicate_deps.at, tests/duplicate_members.at,
    tests/early-libtool.at, tests/exceptions.at,
    tests/execute-mode.at, tests/exeext.at, tests/export-def.at,
    tests/export.at, tests/f77demo.at, tests/fail.at,
    tests/fcdemo.at, tests/flags.at, tests/help.at,
    tests/indirect_deps.at, tests/infer-tag.at,
    tests/inherited_flags.at, tests/install.at,
    tests/lalib-syntax.at, tests/libtool.at, tests/libtoolize.at,
    tests/link-order.at, tests/link-order2.at, tests/loadlibrary.at,
    tests/localization.at, tests/lt_dladvise.at, tests/lt_dlexit.at,
    tests/lt_dlopen.at, tests/lt_dlopen_a.at, tests/lt_dlopenext.at,
    tests/ltdl-api.at, tests/ltdl-libdir.at, tests/mdemo.at,
    tests/need_lib_prefix.at, tests/no-executables.at,
    tests/nocase.at, tests/nonrecursive.at, tests/old-ltdl-iface.at,
    tests/old-m4-iface.at, tests/pic_flag.at, tests/recursive.at,
    tests/resident.at, tests/runpath-in-lalib.at,
    tests/search-path.at, tests/shlibpath.at, tests/slist.at,
    tests/standalone.at, tests/static.at, tests/stresstest.at,
    tests/subproject.at, tests/sysroot.at, tests/tagdemo.at,
    tests/template.at, tests/testsuite.at, tests/versioning.at,
    tests/with-pic.at: Bump copyright year.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

commit 11ab8f1f63cb35b1da289191eb7a1dadc57dd8bf
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Thu Jan 2 12:03:30 2014 +1300

    gnulib: update to latest upstream revision.
    
    * gnulib: Update.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

commit 564d58222c58acaabf435a99d5e0acf32572bbe6
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Mon Dec 23 21:52:20 2013 +1300

    tests: gcj cannot reliably compile directly to .o from .java
    
    Some 4.3.x and 4.4.x releases of gcj insert a spurious 'dummy'
    symbol into every object file when compiling directly from .java
    to .o:
    * tests/convenience.at (GCJ): make .class files from .java
    sources first, and then compile those to native objects. This
    works around http://gcc.gnu.org/bugzilla/show_bug.cgi?id=42143
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

commit 8d285ed54b9b9b307e8fe1a25ba9e624eab93b8d
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Mon Dec 23 18:58:31 2013 +1300

    testsuite: with SunStudio12.x f77, don't fail on system symbols
    
    Modern SunStudio f77 is just a wrapper for f90, which
    explains why current master fails these test groups with:
    
     Undefined	first referenced
      symbol  	    in file
     __f90_slw_ch      .libs/foof2.o
     __f90_sslw        .libs/foof2.o
     __f90_eslw        .libs/foof2.o
     ld: fatal: symbol referencing errors. No output written to
    .libs/libfoo2.so.0.0.0
    
    So we allow some undefined symbols in the libraries, which are
    resolved by the $(FLIBS) added to the final binaries in the tests.
    This seems like the simpler, and less error inducing solution to
    me (compared to adding $(FLIBS) to every library LDFLAGS line).
    * tests/f77demo.at (libfoo_la_LDFLAGS, libfoo2_la_LDFLAGS)
    (libfoo3_la_LDFLAGS, libmix_la_LDFLAGS): Remove -no-undefined
    flag.
    * tests/fcdemo.at: Likewise.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

commit 7f99bfd86c97038b73a1e5d1445ef31c6ec59983
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Wed Oct 30 18:25:44 2013 +1300

    maint: use $SED and $GREP, not sed and grep in all scripts.
    
    Choosing between hardcoding a tool's name, or using the shell
    variable with a path to the user's prefered implementation or
    configure's idea of the best available is a premature
    optimisation.
    * build-aux/ltmain.in, gl/build-aux/bootstrap.in,
    gl/build-aux/extract-trace, gl/build-aux/funclib.sh,
    libtoolize.in: Use $SED and $GREP consistently throughout,
    instead of hardcoding sed and grep.
    * bootstrap: Regenerate.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

commit 0e1ba2182cbbae47d5da09984c776774ab2616ea
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Wed Oct 30 17:47:45 2013 +1300

    tests: use TESTS_ENVIRONMENT for EGREP and FGREP.
    
    Be consistent about passing commands to the testsuite, and use
    TESTS_ENVIRONMENT consistent.
    * Makefile.am (TESTS_ENVIRONMENT): Add EGREP and FGREP.
    * tests/testsuite.at: Remove EGREP and FGREP extractions from
    generated libtool script.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

commit 747c60634e269ecf740254d86f4a4a2500c20524
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Wed Oct 30 17:39:06 2013 +1300

    tests: use $GREP throughout.
    
    Trust the user, and use $GREP from TESTS_EVVIRONMENT uniformly.
    * Makefile.am (TESTS_ENVIRONMENT): Add GREP setting.
    * tests/am-subdir.at, tests/archive-in-archive.at, tests/bindir.at,
    tests/configure-iface.at, tests/cwrapper.at, tests/darwin.at,
    tests/demo.at, tests/destdir.at, tests/dumpbin-symbols.at,
    tests/early-libtool.at, tests/execute-mode.at, tests/export-def.at,
    tests/export.at, tests/f77demo.at, tests/fcdemo.at, tests/flags.at,
    tests/help.at, tests/inherited_flags.at, tests/install.at,
    tests/lalib-syntax.at, tests/libtool.at, tests/libtoolize.at,
    tests/localization.at, tests/lt_dladvise.at, tests/lt_dlopen.at,
    tests/lt_dlopenext.at, tests/ltdl-api.at, tests/ltdl-libdir.at,
    tests/mdemo.at, tests/old-m4-iface.at, tests/pic_flag.at,
    tests/resident.at, tests/runpath-in-lalib.at, tests/search-path.at,
    tests/static.at, tests/sysroot.at, tests/template.at,
    tests/testsuite.at, tests/versioning.at: Replace all hardcoded grep
    invocations with $GREP.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

commit cc189e7daf95b91d22c585b2cdf6b787c8e3c3c6
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Wed Oct 30 17:21:38 2013 +1300

    tests: use $SED throughout.
    
    Trust the user, and use $SED from TESTS_ENVIRONMENT uniformly.
    Hardcoding 'sed' for "simple" edits is a premature optimisation.
    * tests/cdemo.at, tests/cmdline_wrap.at, tests/cwrapper.at,
    tests/darwin.at, tests/demo.at, tests/duplicate_conv.at,
    tests/duplicate_members.at, tests/execute-mode.at, tests/export.at,
    tests/inherited_flags.at, tests/install.at, tests/libtoolize.at,
    tests/mdemo.at, tests/need_lib_prefix.at, tests/old-m4-iface.at,
    tests/sysroot.at, tests/tagdemo.at, tests/testsuite.at: Replace all
    hardcoded sed invocations with $SED.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

commit 83405160afeb97ffd4430fd37c8edd7eeb703366
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Wed Oct 30 15:33:20 2013 +1300

    tests: run cmdline_wrap last, or not at all if anything else failed.
    
    * Makefile.am (TESTSUITE_AT): Move stresstest.at and cmdline_wrap.at
    to the end of the list.
    * tests/cmdline_wrap.at: If previous tests have failed, then we
    already know that rerunning them will fail too, so save time by
    skipping in that case.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

commit 3050db962c61ea81d67f90e33135a668650f5fe0
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Wed Oct 30 17:45:29 2013 +1300

    configury: remove spurious g modifier in sed expression.
    
    * Makefile.am (rebuild): Remove useless g modifier from sed
    expression.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

commit 24be64322deed74bec35893143fcd28494c570cd
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Wed Oct 30 14:55:00 2013 +1300

    configury: use $(SED) where input does not end in newline.
    
    On Solaris machines the system sed does not process the last
    line of input unless it ends with a newline, which means it
    cannot be used to massage the output of git-version-gen, because
    it deliberately omits the terminating newline.
    * Makefile.am (rebuild): Use the sed command found by configure,
    which has a better chance of working properly than the first sed
    on PATH.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

commit 9cb8bb6d065f0453abea50b35e7bbd4c4598a52b
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Wed Oct 30 12:01:27 2013 +1300

    tests: skip fcdemo checks when $FC cannot compile fortran90.
    
    Avoid spurious fcdemo failures when Autoconf picks f77 or
    similar for a fortran90 compiler.
    * tests/testsuite.at (LT_AT_TAG): Using FC and FCFLAGS from make
    TESTS_ENVIRONMENT, check that we really can compile fortran90
    or else skip.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

commit 4e373ebe1308473a47ae1ba9da291a505184a9cb
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Wed Oct 30 18:17:21 2013 +1300

    funclib.sh: improve comments.
    
    * gl/build-aux/funclib.sh: Add a comment explaining the need for
    extra SED and GREP searches.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

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

Summary of changes:
 .x-update-copyright            |    3 ++
 AUTHORS                        |    2 +-
 ChangeLog.old                  |    2 +-
 HACKING                        |    2 +-
 Makefile.am                    |   18 +++++++----
 NEWS                           |    2 +-
 README                         |    2 +-
 THANKS                         |    3 +-
 TODO                           |    2 +-
 bootstrap                      |   64 ++++++++++++++++++++++-----------------
 bootstrap.conf                 |    2 +-
 build-aux/edit-readme-alpha    |    2 +-
 build-aux/git-hooks/commit-msg |   25 ++++++++++++++--
 build-aux/ltmain.in            |   24 ++++++++-------
 cfg.mk                         |    2 +-
 configure.ac                   |    2 +-
 doc/libtool.texi               |    6 ++--
 gl/build-aux/bootstrap.in      |   41 ++++++++++++++------------
 gl/build-aux/extract-trace     |    4 +-
 gl/build-aux/funclib.sh        |   17 +++++++----
 gl/build-aux/inline-source     |    2 +-
 gl/build-aux/options-parser    |    2 +-
 gnulib                         |    2 +-
 libltdl/README                 |    2 +-
 libltdl/argz.c                 |    2 +-
 libltdl/argz_.h                |    2 +-
 libltdl/configure.ac           |    2 +-
 libltdl/libltdl/lt__alloc.h    |    2 +-
 libltdl/libltdl/lt__dirent.h   |    2 +-
 libltdl/libltdl/lt__glibc.h    |    2 +-
 libltdl/libltdl/lt__private.h  |    2 +-
 libltdl/libltdl/lt__strl.h     |    2 +-
 libltdl/libltdl/lt_dlloader.h  |    2 +-
 libltdl/libltdl/lt_error.h     |    2 +-
 libltdl/libltdl/lt_system.h    |    2 +-
 libltdl/libltdl/slist.h        |    2 +-
 libltdl/loaders/dld_link.c     |    2 +-
 libltdl/loaders/dlopen.c       |    2 +-
 libltdl/loaders/dyld.c         |    2 +-
 libltdl/loaders/load_add_on.c  |    2 +-
 libltdl/loaders/loadlibrary.c  |    2 +-
 libltdl/loaders/preopen.c      |    2 +-
 libltdl/loaders/shl_load.c     |    2 +-
 libltdl/lt__alloc.c            |    2 +-
 libltdl/lt__dirent.c           |    2 +-
 libltdl/lt__strl.c             |    2 +-
 libltdl/lt_dlloader.c          |    2 +-
 libltdl/lt_error.c             |    2 +-
 libltdl/ltdl.c                 |    2 +-
 libltdl/ltdl.h                 |    2 +-
 libltdl/ltdl.mk                |    2 +-
 libltdl/slist.c                |    2 +-
 libtoolize.in                  |   10 +++---
 m4/argz.m4                     |    2 +-
 m4/autobuild.m4                |    2 +-
 m4/libtool.m4                  |    2 +-
 m4/ltdl.m4                     |    2 +-
 m4/ltoptions.m4                |    2 +-
 m4/ltsugar.m4                  |    2 +-
 m4/ltversion.in                |    2 +-
 m4/lt~obsolete.m4              |    2 +-
 tests/am-subdir.at             |    6 ++--
 tests/archive-in-archive.at    |    8 ++--
 tests/bindir.at                |    6 ++--
 tests/cdemo.at                 |    4 +-
 tests/cmdline_wrap.at          |    7 +++-
 tests/configure-iface.at       |    4 +-
 tests/convenience.at           |   14 +++++++--
 tests/ctor.at                  |    2 +-
 tests/cwrapper.at              |   22 +++++++-------
 tests/darwin.at                |   18 +++++-----
 tests/demo.at                  |   12 ++++----
 tests/depdemo.at               |    2 +-
 tests/deplib-in-subdir.at      |    2 +-
 tests/deplibs-ident.at         |    2 +-
 tests/deplibs-mingw.at         |    2 +-
 tests/destdir.at               |    4 +-
 tests/dlloader-api.at          |    2 +-
 tests/dumpbin-symbols.at       |    6 ++--
 tests/duplicate_conv.at        |    4 +-
 tests/duplicate_deps.at        |    2 +-
 tests/duplicate_members.at     |    4 +-
 tests/early-libtool.at         |   10 +++---
 tests/exceptions.at            |    2 +-
 tests/execute-mode.at          |   16 +++++-----
 tests/exeext.at                |    2 +-
 tests/export-def.at            |    4 +-
 tests/export.at                |    6 ++--
 tests/f77demo.at               |   10 ++----
 tests/fail.at                  |    2 +-
 tests/fcdemo.at                |   10 ++----
 tests/flags.at                 |    4 +-
 tests/help.at                  |   24 +++++++-------
 tests/indirect_deps.at         |    2 +-
 tests/infer-tag.at             |    2 +-
 tests/inherited_flags.at       |   28 +++++++++---------
 tests/install.at               |   12 ++++----
 tests/lalib-syntax.at          |    4 +-
 tests/libtool.at               |   30 +++++++++---------
 tests/libtoolize.at            |    7 +---
 tests/link-order.at            |    2 +-
 tests/link-order2.at           |    2 +-
 tests/loadlibrary.at           |    2 +-
 tests/localization.at          |    6 ++--
 tests/lt_dladvise.at           |    4 +-
 tests/lt_dlexit.at             |    2 +-
 tests/lt_dlopen.at             |    6 ++--
 tests/lt_dlopen_a.at           |    2 +-
 tests/lt_dlopenext.at          |    8 ++--
 tests/ltdl-api.at              |    6 ++--
 tests/ltdl-libdir.at           |    4 +-
 tests/mdemo.at                 |   16 +++++-----
 tests/need_lib_prefix.at       |    4 +-
 tests/no-executables.at        |    2 +-
 tests/nocase.at                |    2 +-
 tests/nonrecursive.at          |    2 +-
 tests/old-ltdl-iface.at        |    2 +-
 tests/old-m4-iface.at          |   12 ++++----
 tests/pic_flag.at              |   10 +++---
 tests/recursive.at             |    2 +-
 tests/resident.at              |    4 +-
 tests/runpath-in-lalib.at      |    6 ++--
 tests/search-path.at           |    6 ++--
 tests/shlibpath.at             |    2 +-
 tests/slist.at                 |    2 +-
 tests/standalone.at            |    2 +-
 tests/static.at                |    6 ++--
 tests/stresstest.at            |    2 +-
 tests/subproject.at            |    2 +-
 tests/sysroot.at               |   14 ++++----
 tests/tagdemo.at               |    4 +-
 tests/template.at              |    4 +-
 tests/testsuite.at             |   26 ++++++++++-----
 tests/versioning.at            |    6 ++--
 tests/with-pic.at              |    2 +-
 135 files changed, 430 insertions(+), 377 deletions(-)
 create mode 100644 .x-update-copyright

diff --git a/.x-update-copyright b/.x-update-copyright
new file mode 100644
index 0000000..2d30240
--- /dev/null
+++ b/.x-update-copyright
@@ -0,0 +1,3 @@
+ChangeLog.old
+\.diff$
+\.patch$
diff --git a/AUTHORS b/AUTHORS
index e88b687..91bdc36 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -30,7 +30,7 @@
     Charles Wilson		libtool@cwilson.fastmail.fm
     Brooks Moses		bmoses@google.com
 -- 
-  Copyright (C) 1996, 1998-2013 Free Software Foundation, Inc.
+  Copyright (C) 1996, 1998-2014 Free Software Foundation, Inc.
 
   This file is part of GNU Libtool.
 
diff --git a/ChangeLog.old b/ChangeLog.old
index 66009eb..8e2b51c 100644
--- a/ChangeLog.old
+++ b/ChangeLog.old
@@ -24999,7 +24999,7 @@ Thu May 28 18:59:08 1998  Ian Lance Taylor  <ian@cygnus.com>
 
 	* For historical reasons: this is when I started writing libtool.
 -- 
-  Copyright (C) 1996-2013 Free Software Foundation, Inc.
+  Copyright (C) 1996-2010 Free Software Foundation, Inc.
 
   This file is part of GNU Libtool.
 
diff --git a/HACKING b/HACKING
index e263aa3..56be0c3 100644
--- a/HACKING
+++ b/HACKING
@@ -444,7 +444,7 @@ or obtained by writing to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 -- 
-  Copyright (C) 2004-2008, 2010-2013 Free Software Foundation, Inc.
+  Copyright (C) 2004-2008, 2010-2014 Free Software Foundation, Inc.
   Written by Gary V. Vaughan, 2004
 
   This file is part of GNU Libtool.
diff --git a/Makefile.am b/Makefile.am
index fe269ed..77561e1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am -- Process this file with automake to produce Makefile.in
 ##
-##   Copyright (C) 2003-2013 Free Software Foundation, Inc.
+##   Copyright (C) 2003-2014 Free Software Foundation, Inc.
 ##   Written by Gary V. Vaughan, 2003
 ##
 ##   This file is part of GNU Libtool.
@@ -47,7 +47,7 @@ EXTRA_LTLIBRARIES	=
 lt__cd		= CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 
 git_version_gen = '$(SHELL)' '$(aux_dir)/git-version-gen' '--fallback' '$(VERSION)' '.tarball-version'
-rebuild = rebuild=:; revision=`$(lt__cd) $(srcdir) && $(git_version_gen) | sed 's|-.*$$||g'`
+rebuild = rebuild=:; revision=`$(lt__cd) $(srcdir) && $(git_version_gen) | $(SED) 's|-.*$$||'`
 
 
 # ---------- #
@@ -604,7 +604,9 @@ tests_dir	= $(top_srcdir)/tests
 package_m4	= $(tests_dir)/package.m4
 testsuite	= $(tests_dir)/testsuite
 
-# The testsuite files are evaluated in the order given here.
+# The testsuite files are evaluated in the order given here. When
+# adding new tests, make sure cmdline_wrap.at stays at the end so
+# that it can check for previous failures and skip if necessary.
 TESTSUITE	= tests/testsuite
 TESTSUITE_AT	= tests/testsuite.at \
 		  tests/libtoolize.at \
@@ -672,14 +674,15 @@ TESTSUITE_AT	= tests/testsuite.at \
 		  tests/no-executables.at \
 		  tests/deplibs-ident.at \
 		  tests/configure-iface.at \
-		  tests/stresstest.at \
-		  tests/cmdline_wrap.at \
 		  tests/f77demo.at \
 		  tests/fcdemo.at \
 		  tests/darwin.at \
 		  tests/dumpbin-symbols.at \
 		  tests/deplibs-mingw.at \
-		  tests/sysroot.at
+		  tests/sysroot.at \
+		  tests/stresstest.at \
+		  tests/cmdline_wrap.at \
+		  $(NOTHING_ELSE)
 
 EXTRA_DIST     += $(testsuite) $(TESTSUITE_AT) $(package_m4)
 
@@ -688,7 +691,8 @@ TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS)" \
 	CPP="$(CPP)" CPPFLAGS="$(CPPFLAGS)" LD="$(LD)" LDFLAGS="$(LDFLAGS)" \
 	LIBS="$(LIBS)" LN_S="$(LN_S)" NM="$(NM)" RANLIB="$(RANLIB)" \
 	AR="$(AR)" \
-	SED="$(SED)" STRIP="$(STRIP)" lt_INSTALL="$(INSTALL)" \
+	EGREP="$(EGREP)" FGREP="$(FGREP)" GREP="$(GREP)" SED="$(SED)" \
+	STRIP="$(STRIP)" lt_INSTALL="$(INSTALL)" \
 	MANIFEST_TOOL="$(MANIFEST_TOOL)" \
 	OBJEXT="$(OBJEXT)" EXEEXT="$(EXEEXT)" \
 	SHELL="$(SHELL)" CONFIG_SHELL="$(SHELL)" \
diff --git a/NEWS b/NEWS
index 0c85812..4fb1e0a 100644
--- a/NEWS
+++ b/NEWS
@@ -1075,7 +1075,7 @@ New in 0.1:
 * First release of libtool
 * Support for: *-*-freebsd*, *-*-netbsd*, *-*-sunos4*, *-*-ultrix4*
 -- 
-  Copyright (C) 1996, 1998-2013 Free Software Foundation, Inc.
+  Copyright (C) 1996, 1998-2014 Free Software Foundation, Inc.
 
   This file is part of GNU Libtool.
 
diff --git a/README b/README
index 11e9ec4..3ef1bf1 100644
--- a/README
+++ b/README
@@ -299,7 +299,7 @@ things:
     $ libtool --version
     ltmain.sh (GNU libtool 1.1603 2004/09/12 22:02:07) 2.1a
 
-    Copyright (C) 2004, 2011-2013 Free Software Foundation, Inc.
+    Copyright (C) 2004, 2011-2014 Free Software Foundation, Inc.
     This is free software; see the source for copying conditions.  There is NO
     warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
diff --git a/THANKS b/THANKS
index 3c30f61..b59bed2 100644
--- a/THANKS
+++ b/THANKS
@@ -170,6 +170,7 @@
   Rainer Orth			ro@TechFak.Uni-Bielefeld.DE
   Rainer Tammer			tammer@tammer.net
   Ralf Menzel			menzel@ls6.cs.uni-dortmund.de
+  Reuben Thomas			rrt@sc3d.org
   Richard B. Kreckel		kreckel@ginac.de
   Richard Palo			richard.palo@baou.fr
   Richard Purdie		rpurdie@rpsys.net
@@ -211,7 +212,7 @@
   and small patches are credited for their contributions in the ChangeLogs.
 
 -- 
-  Copyright (C) 1996, 1998-1999, 2001-2013 Free Software Foundation,
+  Copyright (C) 1996, 1998-1999, 2001-2014 Free Software Foundation,
   Inc.
   Written by Gord Matzigkeit, 1996
 
diff --git a/TODO b/TODO
index ab09f42..df8bfb0 100644
--- a/TODO
+++ b/TODO
@@ -329,7 +329,7 @@ GNU Libtool
   it easier to add new platforms.
 
 -- 
-  Copyright (C) 2004-2005, 2007-2008, 2011-2013 Free Software
+  Copyright (C) 2004-2005, 2007-2008, 2011-2014 Free Software
   Foundation, Inc.
   Written by Gary V. Vaughan, 2004
 
diff --git a/bootstrap b/bootstrap
index 852efd5..6b4cc6d 100755
--- a/bootstrap
+++ b/bootstrap
@@ -3,7 +3,7 @@
 # Bootstrap an Autotooled package from checked-out sources.
 # Written by Gary V. Vaughan, 2010
 
-# Copyright (C) 2010-2013 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -14,7 +14,7 @@ scriptversion=2013-10-28.05; # UTC
 # General shell script boiler plate, and helper functions.
 # Written by Gary V. Vaughan, 2004
 
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -204,6 +204,11 @@ else
 fi
 
 
+# We want to be able to use the functions in this file before configure
+# has figured out where the best binaries are kept, which means we have
+# to search for them ourselves - except when the results are already set
+# where we skip the searches.
+
 # Unless the user overrides by setting SED, search the path for either GNU
 # sed, or the sed that truncates its output the least.
 test -z "$SED" && {
@@ -246,7 +251,7 @@ test -z "$SED" && {
 
 
 # Unless the user overrides by setting GREP, search the path for either GNU
-# grep, or the sed that truncates its output the least.
+# grep, or the grep that truncates its output the least.
 test -z "$GREP" && {
   func_check_prog_grep ()
   {
@@ -735,11 +740,11 @@ func_echo_infix_1 ()
     for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan"
     do
       test -n "$_G_tc" && {
-        _G_esc_tc=`$bs_echo "$_G_tc" | sed "$sed_make_literal_regex"`
-        _G_indent=`$bs_echo "$_G_indent" | sed "s|$_G_esc_tc||g"`
+        _G_esc_tc=`$bs_echo "$_G_tc" | $SED "$sed_make_literal_regex"`
+        _G_indent=`$bs_echo "$_G_indent" | $SED "s|$_G_esc_tc||g"`
       }
     done
-    _G_indent="$progname: "`echo "$_G_indent" | sed 's|.| |g'`"  " ## exclude from sc_prohibit_nested_quotes
+    _G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`"  " ## exclude from sc_prohibit_nested_quotes
 
     func_echo_infix_1_IFS=$IFS
     IFS=$nl
@@ -1336,7 +1341,7 @@ func_lt_ver ()
 {
     $debug_cmd
 
-    test "x$1" = x`func_sort_ver "$1" "$2" | sed 1q`
+    test "x$1" = x`func_sort_ver "$1" "$2" | $SED 1q`
 }
 
 
@@ -1355,7 +1360,7 @@ scriptversion=2012-10-21.11; # UTC
 # A portable, pluggable option parser for Bourne shell.
 # Written by Gary V. Vaughan, 2010
 
-# Copyright (C) 2010-2013 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -1960,7 +1965,7 @@ func_version ()
 # Extract macro arguments from autotools input with GNU M4.
 # Written by Gary V. Vaughan, 2010
 #
-# Copyright (C) 2010-2013 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -2025,7 +2030,7 @@ func_autoconf_configure ()
 
     # If we were passed a genuine file, make sure it calls AC_INIT.
     test -f "$1" \
-      && _G_ac_init=`$SED "$_G_sed_no_comment" "$1" |grep AC_INIT`
+      && _G_ac_init=`$SED "$_G_sed_no_comment" "$1" |$GREP AC_INIT`
 
     # Otherwise it is not a genuine Autoconf input file.
     test -n "$_G_ac_init"
@@ -2377,7 +2382,7 @@ test extract-trace = "$progname" && func_main "$@"
 # End:
 
 # Set a version string for *this* script.
-scriptversion=2013-09-16.03; # UTC
+scriptversion=2014-01-01.22; # UTC
 
 # 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
@@ -2721,7 +2726,7 @@ func_reconfigure ()
         func_ensure_changelog
     else
       $require_gnulib_cache
-      if sed -n '/^gl_MODULES(\[/,/^])$/p' $gnulib_cache 2>/dev/null |
+      if $SED -n '/^gl_MODULES(\[/,/^])$/p' $gnulib_cache 2>/dev/null |
          func_grep_q gitlog-to-changelog
       then
         func_ensure_changelog
@@ -3138,7 +3143,7 @@ func_clean_unused_macros ()
 
       # We use 'ls|grep' instead of 'ls *.m4' to avoid exceeding
       # command line length limits in some shells.
-      for file in `cd "$macro_dir" && ls -1 |grep '\.m4$'`; do
+      for file in `cd "$macro_dir" && ls -1 |$GREP '\.m4$'`; do
 
 	# Remove a macro file when aclocal.m4 does not m4_include it...
         func_grep_q 'm4_include([[]'$macro_dir/$file'])' $aclocal_m4s \
@@ -4362,27 +4367,30 @@ func_grep_q ()
 # func_ifcontains LIST MEMBER YES-CMD [NO-CMD]
 # --------------------------------------------
 # If whitespace-separated LIST contains MEMBER then execute YES-CMD,
-# otherwise if NO-CMD was give, execute that.
+# otherwise if NO-CMD was given, execute that.
 func_ifcontains ()
 {
     $debug_cmd
 
-    # The embedded echo is to squash whitespace before globbing.
-    _G_wslist=`$bs_echo " "$1" "`
+    _G_wslist=$1
     _G_member=$2
     _G_yes_cmd=$3
     _G_no_cmd=${4-":"}
 
-    case $_G_wslist in
-      *" $_G_member "*)
-        eval "$_G_yes_cmd"
-	_G_status=$?
-	;;
-      *)
-	eval "$_G_no_cmd"
-	_G_status=$?
-	;;
-    esac
+    _G_found=false
+    for _G_item in $_G_wslist; do
+      test "x$_G_item" = "x$_G_member" && {
+        _G_found=:
+	break
+      }
+    done
+    if $_G_found; then
+      eval "$_G_yes_cmd"
+      _G_status=$?
+    else
+      eval "$_G_no_cmd"
+      _G_status=$?
+    fi
 
     test 0 -eq "$_G_status" || exit $_G_status
 }
@@ -4625,7 +4633,7 @@ func_gitignore_entries ()
 {
     $debug_cmd
 
-    sed -e '/^#/d' -e '/^$/d' "$@"
+    $SED -e '/^#/d' -e '/^$/d' "$@"
 }
 
 
@@ -4658,7 +4666,7 @@ func_insert_if_absent ()
       linesnew=`{ $bs_echo "$str"; cat "$file"; } \
                 |func_gitignore_entries |sort -u |wc -l`
       test "$linesold" -eq "$linesnew" \
-        || { sed "1i\\$nl$str$nl" "$file" >"$file"T && mv "$file"T "$file"; } \
+        || { $SED "1i\\$nl$str$nl" "$file" >"$file"T && mv "$file"T "$file"; } \
         || func_permissions_error "$file"
     done
 }
diff --git a/bootstrap.conf b/bootstrap.conf
index 2001ccb..6365ca6 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -1,6 +1,6 @@
 # bootstrap.conf (GNU Libtool) version 2011-11-24
 #
-# Copyright (C) 2010-2013 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014 Free Software Foundation, Inc.
 # Written by Gary V. Vaughan, 2010
 
 # This is free software; see the source for copying conditions.  There is NO
diff --git a/build-aux/edit-readme-alpha b/build-aux/edit-readme-alpha
index ee74448..390994a 100755
--- a/build-aux/edit-readme-alpha
+++ b/build-aux/edit-readme-alpha
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 #   edit-readme-alpha - edit README file for alpha releases
-#   Copyright (C) 2010-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2010-2014 Free Software Foundation, Inc.
 #   Written by Gary V. Vaughan, 2010
 #
 #   This file is part of GNU Libtool.
diff --git a/build-aux/git-hooks/commit-msg b/build-aux/git-hooks/commit-msg
index 4ecbb2d..0d27552 100755
--- a/build-aux/git-hooks/commit-msg
+++ b/build-aux/git-hooks/commit-msg
@@ -1,7 +1,26 @@
 #!/bin/sh
-# An example hook script for catching duplicate or malformed
-# Co-authored-by or Copyright-paperwork-exempt lines in the
-# commit message.
+
+# An example hook script for catching duplicate or malformed Co-authored-by
+# or Copyright-paperwork-exempt lines in the commit message.
+# Written by Gary V. Vaughan <gary@gnu.org>, 2011
+
+# Copyright (C) 2011-2014 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# Libtoolize 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 of the License, or
+# (at your option) any later version.
+#
+# Libtoolize 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/>.
+
 
 : ${SED="sed"}
 test set = ${ECHO+'set'} = set || ECHO='printf %s\n'
diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
index 0da8ad7..b7c85e2 100644
--- a/build-aux/ltmain.in
+++ b/build-aux/ltmain.in
@@ -4,7 +4,7 @@
 # Provide generalized library-building support services.
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -1878,7 +1878,7 @@ if $opt_help; then
       for opt_mode in compile link execute install finish uninstall clean; do
 	func_mode_help
       done
-    } | sed -n '1p; 2,$s/^Usage:/  or: /p'
+    } | $SED -n '1p; 2,$s/^Usage:/  or: /p'
     {
       func_help noexit
       for opt_mode in compile link execute install finish uninstall clean; do
@@ -1886,7 +1886,7 @@ if $opt_help; then
 	func_mode_help
       done
     } |
-    sed '1d
+    $SED '1d
       /^When reporting/,/^Report/{
 	H
 	d
@@ -2076,7 +2076,7 @@ func_mode_finish ()
       else
         tmpdir=`func_mktempdir`
         for lib in $libs; do
-	  sed -e "$sysroot_cmd s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
+	  $SED -e "$sysroot_cmd s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
 	    > $tmpdir/tmp-la
 	  mv -f $tmpdir/tmp-la $lib
 	done
@@ -2631,7 +2631,7 @@ func_generate_dlsyms ()
     my_outputname=$1
     my_originator=$2
     my_pic_p=${3-false}
-    my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
+    my_prefix=`$ECHO "$my_originator" | $SED 's%[^a-zA-Z0-9]%_%g'`
     my_dlsyms=
 
     if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
@@ -8088,15 +8088,17 @@ EOF
       # the extraction.
       reload_conv_objs=
       gentop=
-      # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec and hope we can get by with
-      # turning comma into space..
-      wl=
-
+      # if reload_cmds runs $LD directly, get rid of -Wl from
+      # whole_archive_flag_spec and hope we can get by with turning comma
+      # into space.
+      case $reload_cmds in
+        *\$LD\ *) wl= ;;
+      esac
       if test -n "$convenience"; then
 	if test -n "$whole_archive_flag_spec"; then
 	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
-	  reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+	  test -n "$wl" || tmp_whole_archive_flags=`$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+	  reload_conv_objs=$reload_objs\ $tmp_whole_archive_flags
 	else
 	  gentop=$output_objdir/${obj}x
 	  func_append generated " $gentop"
diff --git a/cfg.mk b/cfg.mk
index 6d308de..6620685 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -1,6 +1,6 @@
 # cfg.mk -- Configuration for maintainer-makefile
 #
-#   Copyright (c) 2011-2013 Free Software Foundation, Inc.
+#   Copyright (c) 2011-2014 Free Software Foundation, Inc.
 #   Written by Gary V. Vaughan, 2011
 #
 #   This file is part of GNU Libtool.
diff --git a/configure.ac b/configure.ac
index a9e6aee..c4dbe9f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 # Process this file with autoconf to create configure. -*- autoconf -*-
 
-#   Copyright (C) 2001, 2004-2005, 2008, 2010-2013 Free Software
+#   Copyright (C) 2001, 2004-2005, 2008, 2010-2014 Free Software
 #   Foundation, Inc.
 #   Written by Gary V. Vaughan, 2001
 #
diff --git a/doc/libtool.texi b/doc/libtool.texi
index 3f701cc..05fec92 100644
--- a/doc/libtool.texi
+++ b/doc/libtool.texi
@@ -20,7 +20,7 @@
 @copying
 This manual is for GNU Libtool (version @value{VERSION}, @value{UPDATED}).
 
-Copyright @copyright{} 1996--2013 Free Software Foundation, Inc.
+Copyright @copyright{} 1996-2014 Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3
@@ -935,7 +935,7 @@ lives.  So, let's try again, by invoking GDB directly on the executable:
 @example
 burger$ @kbd{gdb @value{objdir}/hell}
 GNU gdb 5.3 (i386-unknown-netbsd)
-Copyright 2002, 2011-2013 Free Software Foundation, Inc.
+Copyright 2002 Free Software Foundation, Inc.
 GDB is free software, covered by the GNU General Public License,
 and you are welcome to change it and/or distribute copies of it
 under certain conditions.  Type "show copying" to see the conditions.
@@ -7166,7 +7166,7 @@ trick$ chmod +x libtool
 trick$ libtool --version
 ltmain.sh (GNU @@PACKAGE@@@@TIMESTAMP@@) @@VERSION@@
 
-Copyright (C) 2011 Free Software Foundation, Inc.
+Copyright (C) 2014 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 trick$
diff --git a/gl/build-aux/bootstrap.in b/gl/build-aux/bootstrap.in
index e83835c..d346fee 100755
--- a/gl/build-aux/bootstrap.in
+++ b/gl/build-aux/bootstrap.in
@@ -3,7 +3,7 @@
 # Bootstrap an Autotooled package from checked-out sources.
 # Written by Gary V. Vaughan, 2010
 
-# Copyright (C) 2010-2013 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -13,7 +13,7 @@
 . `echo "$0" |${SED-sed} 's|[^/]*$||'`"extract-trace"
 
 # Set a version string for *this* script.
-scriptversion=2013-09-16.03; # UTC
+scriptversion=2014-01-01.22; # UTC
 
 # 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
@@ -357,7 +357,7 @@ func_reconfigure ()
         func_ensure_changelog
     else
       $require_gnulib_cache
-      if sed -n '/^gl_MODULES(\[/,/^])$/p' $gnulib_cache 2>/dev/null |
+      if $SED -n '/^gl_MODULES(\[/,/^])$/p' $gnulib_cache 2>/dev/null |
          func_grep_q gitlog-to-changelog
       then
         func_ensure_changelog
@@ -774,7 +774,7 @@ func_clean_unused_macros ()
 
       # We use 'ls|grep' instead of 'ls *.m4' to avoid exceeding
       # command line length limits in some shells.
-      for file in `cd "$macro_dir" && ls -1 |grep '\.m4$'`; do
+      for file in `cd "$macro_dir" && ls -1 |$GREP '\.m4$'`; do
 
 	# Remove a macro file when aclocal.m4 does not m4_include it...
         func_grep_q 'm4_include([[]'$macro_dir/$file'])' $aclocal_m4s \
@@ -1998,27 +1998,30 @@ func_grep_q ()
 # func_ifcontains LIST MEMBER YES-CMD [NO-CMD]
 # --------------------------------------------
 # If whitespace-separated LIST contains MEMBER then execute YES-CMD,
-# otherwise if NO-CMD was give, execute that.
+# otherwise if NO-CMD was given, execute that.
 func_ifcontains ()
 {
     $debug_cmd
 
-    # The embedded echo is to squash whitespace before globbing.
-    _G_wslist=`$bs_echo " "$1" "`
+    _G_wslist=$1
     _G_member=$2
     _G_yes_cmd=$3
     _G_no_cmd=${4-":"}
 
-    case $_G_wslist in
-      *" $_G_member "*)
-        eval "$_G_yes_cmd"
-	_G_status=$?
-	;;
-      *)
-	eval "$_G_no_cmd"
-	_G_status=$?
-	;;
-    esac
+    _G_found=false
+    for _G_item in $_G_wslist; do
+      test "x$_G_item" = "x$_G_member" && {
+        _G_found=:
+	break
+      }
+    done
+    if $_G_found; then
+      eval "$_G_yes_cmd"
+      _G_status=$?
+    else
+      eval "$_G_no_cmd"
+      _G_status=$?
+    fi
 
     test 0 -eq "$_G_status" || exit $_G_status
 }
@@ -2261,7 +2264,7 @@ func_gitignore_entries ()
 {
     $debug_cmd
 
-    sed -e '/^#/d' -e '/^$/d' "$@"
+    $SED -e '/^#/d' -e '/^$/d' "$@"
 }
 
 
@@ -2294,7 +2297,7 @@ func_insert_if_absent ()
       linesnew=`{ $bs_echo "$str"; cat "$file"; } \
                 |func_gitignore_entries |sort -u |wc -l`
       test "$linesold" -eq "$linesnew" \
-        || { sed "1i\\$nl$str$nl" "$file" >"$file"T && mv "$file"T "$file"; } \
+        || { $SED "1i\\$nl$str$nl" "$file" >"$file"T && mv "$file"T "$file"; } \
         || func_permissions_error "$file"
     done
 }
diff --git a/gl/build-aux/extract-trace b/gl/build-aux/extract-trace
index 5e42ea7..6b469d2 100755
--- a/gl/build-aux/extract-trace
+++ b/gl/build-aux/extract-trace
@@ -3,7 +3,7 @@
 # Extract macro arguments from autotools input with GNU M4.
 # Written by Gary V. Vaughan, 2010
 #
-# Copyright (C) 2010-2013 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -68,7 +68,7 @@ func_autoconf_configure ()
 
     # If we were passed a genuine file, make sure it calls AC_INIT.
     test -f "$1" \
-      && _G_ac_init=`$SED "$_G_sed_no_comment" "$1" |grep AC_INIT`
+      && _G_ac_init=`$SED "$_G_sed_no_comment" "$1" |$GREP AC_INIT`
 
     # Otherwise it is not a genuine Autoconf input file.
     test -n "$_G_ac_init"
diff --git a/gl/build-aux/funclib.sh b/gl/build-aux/funclib.sh
index aedc85c..73b3e26 100644
--- a/gl/build-aux/funclib.sh
+++ b/gl/build-aux/funclib.sh
@@ -4,7 +4,7 @@ scriptversion=2013-10-28.05; # UTC
 # General shell script boiler plate, and helper functions.
 # Written by Gary V. Vaughan, 2004
 
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -194,6 +194,11 @@ else
 fi
 
 
+# We want to be able to use the functions in this file before configure
+# has figured out where the best binaries are kept, which means we have
+# to search for them ourselves - except when the results are already set
+# where we skip the searches.
+
 # Unless the user overrides by setting SED, search the path for either GNU
 # sed, or the sed that truncates its output the least.
 test -z "$SED" && {
@@ -236,7 +241,7 @@ test -z "$SED" && {
 
 
 # Unless the user overrides by setting GREP, search the path for either GNU
-# grep, or the sed that truncates its output the least.
+# grep, or the grep that truncates its output the least.
 test -z "$GREP" && {
   func_check_prog_grep ()
   {
@@ -725,11 +730,11 @@ func_echo_infix_1 ()
     for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan"
     do
       test -n "$_G_tc" && {
-        _G_esc_tc=`$bs_echo "$_G_tc" | sed "$sed_make_literal_regex"`
-        _G_indent=`$bs_echo "$_G_indent" | sed "s|$_G_esc_tc||g"`
+        _G_esc_tc=`$bs_echo "$_G_tc" | $SED "$sed_make_literal_regex"`
+        _G_indent=`$bs_echo "$_G_indent" | $SED "s|$_G_esc_tc||g"`
       }
     done
-    _G_indent="$progname: "`echo "$_G_indent" | sed 's|.| |g'`"  " ## exclude from sc_prohibit_nested_quotes
+    _G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`"  " ## exclude from sc_prohibit_nested_quotes
 
     func_echo_infix_1_IFS=$IFS
     IFS=$nl
@@ -1326,7 +1331,7 @@ func_lt_ver ()
 {
     $debug_cmd
 
-    test "x$1" = x`func_sort_ver "$1" "$2" | sed 1q`
+    test "x$1" = x`func_sort_ver "$1" "$2" | $SED 1q`
 }
 
 
diff --git a/gl/build-aux/inline-source b/gl/build-aux/inline-source
index 4bd26b1..1e99a16 100755
--- a/gl/build-aux/inline-source
+++ b/gl/build-aux/inline-source
@@ -3,7 +3,7 @@
 # Output the contents of a shell script with sourced files inlined.
 # Written by Gary V. Vaughan, 2012
 
-# Copyright (C) 2012-2013 Free Software Foundation, Inc.
+# Copyright (C) 2012-2014 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
diff --git a/gl/build-aux/options-parser b/gl/build-aux/options-parser
index 13cd39b..f6c8017 100644
--- a/gl/build-aux/options-parser
+++ b/gl/build-aux/options-parser
@@ -6,7 +6,7 @@ scriptversion=2012-10-21.11; # UTC
 # A portable, pluggable option parser for Bourne shell.
 # Written by Gary V. Vaughan, 2010
 
-# Copyright (C) 2010-2013 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
diff --git a/gnulib b/gnulib
index 5191b35..a39d408 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 5191b3546cfb6c163228c23f214e325ddf60d46f
+Subproject commit a39d4083cab589d7cd6a13e8a4b8db8875261d75
diff --git a/libltdl/README b/libltdl/README
index 3713f13..b7e89a7 100644
--- a/libltdl/README
+++ b/libltdl/README
@@ -9,7 +9,7 @@ It supports the following dlopen interfaces:
 * dyld (darwin/Mac OS X)
 * libtool's dlpreopen
 --
-   Copyright (C) 1999, 2003, 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2003, 2011-2014 Free Software Foundation, Inc.
    Written by Thomas Tanner, 1999
 
    This file is part of GNU Libtool.
diff --git a/libltdl/argz.c b/libltdl/argz.c
index 1853d2d..2fcb90c 100644
--- a/libltdl/argz.c
+++ b/libltdl/argz.c
@@ -1,6 +1,6 @@
 /* argz.c -- argz implementation for non-glibc systems
 
-   Copyright (C) 2004, 2006-2008, 2011-2013 Free Software Foundation,
+   Copyright (C) 2004, 2006-2008, 2011-2014 Free Software Foundation,
    Inc.
    Written by Gary V. Vaughan, 2004
 
diff --git a/libltdl/argz_.h b/libltdl/argz_.h
index 9a95c35..8f0b854 100644
--- a/libltdl/argz_.h
+++ b/libltdl/argz_.h
@@ -1,6 +1,6 @@
 /* lt__argz.h -- internal argz interface for non-glibc systems
 
-   Copyright (C) 2004, 2007-2008, 2011-2013 Free Software Foundation,
+   Copyright (C) 2004, 2007-2008, 2011-2014 Free Software Foundation,
    Inc.
    Written by Gary V. Vaughan, 2004
 
diff --git a/libltdl/configure.ac b/libltdl/configure.ac
index 62bd576..3600ca9 100644
--- a/libltdl/configure.ac
+++ b/libltdl/configure.ac
@@ -1,6 +1,6 @@
 # Process this file with autoconf to create configure. -*- autoconf -*-
 #
-#    Copyright (C) 2004-2005, 2007-2008, 2011-2013 Free Software
+#    Copyright (C) 2004-2005, 2007-2008, 2011-2014 Free Software
 #    Foundation, Inc.
 #    Written by Gary V. Vaughan, 2004
 #
diff --git a/libltdl/libltdl/lt__alloc.h b/libltdl/libltdl/lt__alloc.h
index ab57e26..07bf3e6 100644
--- a/libltdl/libltdl/lt__alloc.h
+++ b/libltdl/libltdl/lt__alloc.h
@@ -1,6 +1,6 @@
 /* lt__alloc.h -- internal memory management interface
 
-   Copyright (C) 2004, 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2011-2014 Free Software Foundation, Inc.
    Written by Gary V. Vaughan, 2004
 
    NOTE: The canonical source of this file is maintained with the
diff --git a/libltdl/libltdl/lt__dirent.h b/libltdl/libltdl/lt__dirent.h
index bf419f6..e7660e7 100644
--- a/libltdl/libltdl/lt__dirent.h
+++ b/libltdl/libltdl/lt__dirent.h
@@ -1,6 +1,6 @@
 /* lt__dirent.h -- internal directory entry scanning interface
 
-   Copyright (C) 2001, 2004, 2006, 2011-2013 Free Software Foundation,
+   Copyright (C) 2001, 2004, 2006, 2011-2014 Free Software Foundation,
    Inc.
    Written by Bob Friesenhahn, 2001
 
diff --git a/libltdl/libltdl/lt__glibc.h b/libltdl/libltdl/lt__glibc.h
index 7a84250..8b96c89 100644
--- a/libltdl/libltdl/lt__glibc.h
+++ b/libltdl/libltdl/lt__glibc.h
@@ -1,6 +1,6 @@
 /* lt__glibc.h -- support for non glibc environments
 
-   Copyright (C) 2004, 2006-2007, 2011-2013 Free Software Foundation,
+   Copyright (C) 2004, 2006-2007, 2011-2014 Free Software Foundation,
    Inc.
    Written by Gary V. Vaughan, 2004
 
diff --git a/libltdl/libltdl/lt__private.h b/libltdl/libltdl/lt__private.h
index bae6b9f..2bee9b5 100644
--- a/libltdl/libltdl/lt__private.h
+++ b/libltdl/libltdl/lt__private.h
@@ -1,6 +1,6 @@
 /* lt__private.h -- internal apis for libltdl
 
-   Copyright (C) 2004-2008, 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2004-2008, 2011-2014 Free Software Foundation, Inc.
    Written by Gary V. Vaughan, 2004
 
    NOTE: The canonical source of this file is maintained with the
diff --git a/libltdl/libltdl/lt__strl.h b/libltdl/libltdl/lt__strl.h
index a522038..d5f44fd 100644
--- a/libltdl/libltdl/lt__strl.h
+++ b/libltdl/libltdl/lt__strl.h
@@ -1,6 +1,6 @@
 /* lt__strl.h -- size-bounded string copying and concatenation
 
-   Copyright (C) 2004, 2006, 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006, 2011-2014 Free Software Foundation, Inc.
    Written by Bob Friesenhahn, 2004
 
    NOTE: The canonical source of this file is maintained with the
diff --git a/libltdl/libltdl/lt_dlloader.h b/libltdl/libltdl/lt_dlloader.h
index 1cad32a..68b0be5 100644
--- a/libltdl/libltdl/lt_dlloader.h
+++ b/libltdl/libltdl/lt_dlloader.h
@@ -1,6 +1,6 @@
 /* lt_dlloader.h -- dynamic library loader interface
 
-   Copyright (C) 2004, 2007-2008, 2011-2013 Free Software Foundation,
+   Copyright (C) 2004, 2007-2008, 2011-2014 Free Software Foundation,
    Inc.
    Written by Gary V. Vaughan, 2004
 
diff --git a/libltdl/libltdl/lt_error.h b/libltdl/libltdl/lt_error.h
index 8a6e271..5fb0688 100644
--- a/libltdl/libltdl/lt_error.h
+++ b/libltdl/libltdl/lt_error.h
@@ -1,6 +1,6 @@
 /* lt_error.h -- error propagation interface
 
-   Copyright (C) 1999-2001, 2004, 2007, 2011-2013 Free Software
+   Copyright (C) 1999-2001, 2004, 2007, 2011-2014 Free Software
    Foundation, Inc.
    Written by Thomas Tanner, 1999
 
diff --git a/libltdl/libltdl/lt_system.h b/libltdl/libltdl/lt_system.h
index 34ac718..428beed 100644
--- a/libltdl/libltdl/lt_system.h
+++ b/libltdl/libltdl/lt_system.h
@@ -1,6 +1,6 @@
 /* lt_system.h -- system portability abstraction layer
 
-   Copyright (C) 2004, 2007, 2010-2013 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2007, 2010-2014 Free Software Foundation, Inc.
    Written by Gary V. Vaughan, 2004
 
    NOTE: The canonical source of this file is maintained with the
diff --git a/libltdl/libltdl/slist.h b/libltdl/libltdl/slist.h
index a026fb4..3ccea14 100644
--- a/libltdl/libltdl/slist.h
+++ b/libltdl/libltdl/slist.h
@@ -1,6 +1,6 @@
 /* slist.h -- generalised singly linked lists
 
-   Copyright (C) 2000, 2004, 2009, 2011-2013 Free Software Foundation,
+   Copyright (C) 2000, 2004, 2009, 2011-2014 Free Software Foundation,
    Inc.
    Written by Gary V. Vaughan, 2000
 
diff --git a/libltdl/loaders/dld_link.c b/libltdl/loaders/dld_link.c
index 9217963..c5fe3ff 100644
--- a/libltdl/loaders/dld_link.c
+++ b/libltdl/loaders/dld_link.c
@@ -1,6 +1,6 @@
 /* loader-dld_link.c -- dynamic linking with dld
 
-   Copyright (C) 1998-2000, 2004, 2006-2008, 2011-2013 Free Software
+   Copyright (C) 1998-2000, 2004, 2006-2008, 2011-2014 Free Software
    Foundation, Inc.
    Written by Thomas Tanner, 1998
 
diff --git a/libltdl/loaders/dlopen.c b/libltdl/loaders/dlopen.c
index fe81a43..758d7f4 100644
--- a/libltdl/loaders/dlopen.c
+++ b/libltdl/loaders/dlopen.c
@@ -1,6 +1,6 @@
 /* loader-dlopen.c --  dynamic linking with dlopen/dlsym
 
-   Copyright (C) 1998-2000, 2004, 2006-2008, 2011-2013 Free Software
+   Copyright (C) 1998-2000, 2004, 2006-2008, 2011-2014 Free Software
    Foundation, Inc.
    Written by Thomas Tanner, 1998
 
diff --git a/libltdl/loaders/dyld.c b/libltdl/loaders/dyld.c
index 0c0bd9e..7d7cd21 100644
--- a/libltdl/loaders/dyld.c
+++ b/libltdl/loaders/dyld.c
@@ -1,6 +1,6 @@
 /* loader-dyld.c -- dynamic linking on darwin and OS X
 
-   Copyright (C) 1998-2000, 2004, 2006-2008, 2011-2013 Free Software
+   Copyright (C) 1998-2000, 2004, 2006-2008, 2011-2014 Free Software
    Foundation, Inc.
    Written by Peter O'Gorman, 1998
 
diff --git a/libltdl/loaders/load_add_on.c b/libltdl/loaders/load_add_on.c
index fc52731..013411f 100644
--- a/libltdl/loaders/load_add_on.c
+++ b/libltdl/loaders/load_add_on.c
@@ -1,6 +1,6 @@
 /* loader-load_add_on.c --  dynamic linking for BeOS
 
-   Copyright (C) 1998-2000, 2004, 2006-2008, 2011-2013 Free Software
+   Copyright (C) 1998-2000, 2004, 2006-2008, 2011-2014 Free Software
    Foundation, Inc.
    Written by Thomas Tanner, 1998
 
diff --git a/libltdl/loaders/loadlibrary.c b/libltdl/loaders/loadlibrary.c
index 2800fe6..0991100 100644
--- a/libltdl/loaders/loadlibrary.c
+++ b/libltdl/loaders/loadlibrary.c
@@ -1,6 +1,6 @@
 /* loader-loadlibrary.c --  dynamic linking for Win32
 
-   Copyright (C) 1998-2000, 2004-2008, 2010-2013 Free Software
+   Copyright (C) 1998-2000, 2004-2008, 2010-2014 Free Software
    Foundation, Inc.
    Written by Thomas Tanner, 1998
 
diff --git a/libltdl/loaders/preopen.c b/libltdl/loaders/preopen.c
index df41493..330a04c 100644
--- a/libltdl/loaders/preopen.c
+++ b/libltdl/loaders/preopen.c
@@ -1,6 +1,6 @@
 /* loader-preopen.c -- emulate dynamic linking using preloaded_symbols
 
-   Copyright (C) 1998-2000, 2004, 2006-2008, 2011-2013 Free Software
+   Copyright (C) 1998-2000, 2004, 2006-2008, 2011-2014 Free Software
    Foundation, Inc.
    Written by Thomas Tanner, 1998
 
diff --git a/libltdl/loaders/shl_load.c b/libltdl/loaders/shl_load.c
index cc025f5..3b12df3 100644
--- a/libltdl/loaders/shl_load.c
+++ b/libltdl/loaders/shl_load.c
@@ -1,6 +1,6 @@
 /* loader-shl_load.c --  dynamic linking with shl_load (HP-UX)
 
-   Copyright (C) 1998-2000, 2004, 2006-2008, 2011-2013 Free Software
+   Copyright (C) 1998-2000, 2004, 2006-2008, 2011-2014 Free Software
    Foundation, Inc.
    Written by Thomas Tanner, 1998
 
diff --git a/libltdl/lt__alloc.c b/libltdl/lt__alloc.c
index 98f40f5..7743575 100644
--- a/libltdl/lt__alloc.c
+++ b/libltdl/lt__alloc.c
@@ -1,6 +1,6 @@
 /* lt__alloc.c -- internal memory management interface
 
-   Copyright (C) 2004, 2006-2007, 2011-2013 Free Software Foundation,
+   Copyright (C) 2004, 2006-2007, 2011-2014 Free Software Foundation,
    Inc.
    Written by Gary V. Vaughan, 2004
 
diff --git a/libltdl/lt__dirent.c b/libltdl/lt__dirent.c
index aee2eb2..bc9c377 100644
--- a/libltdl/lt__dirent.c
+++ b/libltdl/lt__dirent.c
@@ -1,6 +1,6 @@
 /* lt__dirent.c -- internal directory entry scanning interface
 
-   Copyright (C) 2001, 2004, 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004, 2011-2014 Free Software Foundation, Inc.
    Written by Bob Friesenhahn, 2001
 
    NOTE: The canonical source of this file is maintained with the
diff --git a/libltdl/lt__strl.c b/libltdl/lt__strl.c
index f84247b..227e22e 100644
--- a/libltdl/lt__strl.c
+++ b/libltdl/lt__strl.c
@@ -1,6 +1,6 @@
 /* lt__strl.c -- size-bounded string copying and concatenation
 
-   Copyright (C) 2004, 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2011-2014 Free Software Foundation, Inc.
    Written by Bob Friesenhahn, 2004
 
    NOTE: The canonical source of this file is maintained with the
diff --git a/libltdl/lt_dlloader.c b/libltdl/lt_dlloader.c
index 661e01f..3f6bb97 100644
--- a/libltdl/lt_dlloader.c
+++ b/libltdl/lt_dlloader.c
@@ -1,6 +1,6 @@
 /* lt_dlloader.c -- dynamic library loader interface
 
-   Copyright (C) 2004, 2007-2008, 2011-2013 Free Software Foundation,
+   Copyright (C) 2004, 2007-2008, 2011-2014 Free Software Foundation,
    Inc.
    Written by Gary V. Vaughan, 2004
 
diff --git a/libltdl/lt_error.c b/libltdl/lt_error.c
index 633c29c..90a5e8a 100644
--- a/libltdl/lt_error.c
+++ b/libltdl/lt_error.c
@@ -1,6 +1,6 @@
 /* lt_error.c -- error propagation interface
 
-   Copyright (C) 1999-2001, 2004-2005, 2007, 2011-2013 Free Software
+   Copyright (C) 1999-2001, 2004-2005, 2007, 2011-2014 Free Software
    Foundation, Inc.
    Written by Thomas Tanner, 1999
 
diff --git a/libltdl/ltdl.c b/libltdl/ltdl.c
index 43c4e62..098f9a6 100644
--- a/libltdl/ltdl.c
+++ b/libltdl/ltdl.c
@@ -1,6 +1,6 @@
 /* ltdl.c -- system independent dlopen wrapper
 
-   Copyright (C) 1998-2000, 2004-2008, 2011-2013 Free Software
+   Copyright (C) 1998-2000, 2004-2008, 2011-2014 Free Software
    Foundation, Inc.
    Written by Thomas Tanner, 1998
 
diff --git a/libltdl/ltdl.h b/libltdl/ltdl.h
index daa83cb..6d85128 100644
--- a/libltdl/ltdl.h
+++ b/libltdl/ltdl.h
@@ -1,6 +1,6 @@
 /* ltdl.h -- generic dlopen functions
 
-   Copyright (C) 1998-2000, 2004-2005, 2007-2008, 2011-2013 Free
+   Copyright (C) 1998-2000, 2004-2005, 2007-2008, 2011-2014 Free
    Software Foundation, Inc.
    Written by Thomas Tanner, 1998
 
diff --git a/libltdl/ltdl.mk b/libltdl/ltdl.mk
index 7d9934d..2e9a437 100644
--- a/libltdl/ltdl.mk
+++ b/libltdl/ltdl.mk
@@ -1,6 +1,6 @@
 ## ltdl.mk -- includable Makefile snippet
 ##
-##   Copyright (C) 2003-2005, 2007, 2011-2013 Free Software Foundation,
+##   Copyright (C) 2003-2005, 2007, 2011-2014 Free Software Foundation,
 ##   Inc.
 ##   Written by Gary V. Vaughan, 2003
 ##
diff --git a/libltdl/slist.c b/libltdl/slist.c
index ee02a40..db9401b 100644
--- a/libltdl/slist.c
+++ b/libltdl/slist.c
@@ -1,6 +1,6 @@
 /* slist.c -- generalised singly linked lists
 
-   Copyright (C) 2000, 2004, 2007-2009, 2011-2013 Free Software
+   Copyright (C) 2000, 2004, 2007-2009, 2011-2014 Free Software
    Foundation, Inc.
    Written by Gary V. Vaughan, 2000
 
diff --git a/libtoolize.in b/libtoolize.in
index 3e2ec7c..1842465 100644
--- a/libtoolize.in
+++ b/libtoolize.in
@@ -3,7 +3,7 @@
 # Prepare a package to use libtool.
 # Written by Gary V. Vaughan <gary@gnu.org>, 2003
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -137,8 +137,8 @@ libtoolize_environment_options ()
     my_sed_env_rest='1s/^[^,:; ]*[,:; ]*\(.*\)$/\1/;q'
 
     while test -n "$LIBTOOLIZE_OPTIONS"; do
-      opt=`echo "$LIBTOOLIZE_OPTIONS" | sed "$my_sed_env_opt"`
-      LIBTOOLIZE_OPTIONS=`echo "$LIBTOOLIZE_OPTIONS" | sed "$my_sed_env_rest"`
+      opt=`echo "$LIBTOOLIZE_OPTIONS" | $SED "$my_sed_env_opt"`
+      LIBTOOLIZE_OPTIONS=`echo "$LIBTOOLIZE_OPTIONS" | $SED "$my_sed_env_rest"`
 
       case $opt in
         --debug|--no-warn|--no-warning|--no-warnings|--quiet|--verbose)
@@ -1188,7 +1188,7 @@ func_check_macros ()
 
     # Don't trace for this, we're just checking the user didn't invoke it
     # directly from configure.ac.
-    $SED 's|dnl .*$||; s|# .*$||' "$configure_ac" | grep AC_PROG_RANLIB >/dev/null &&
+    $SED 's|dnl .*$||; s|# .*$||' "$configure_ac" | $GREP AC_PROG_RANLIB >/dev/null &&
       func_echo "'AC_PROG_RANLIB' is rendered obsolete by 'LT_INIT'"
 
     # FIXME: Ensure ltmain.sh, libtool.m4 and ltdl.m4 are from the same release
@@ -1217,7 +1217,7 @@ func_autoconf_configure ()
 
     # If we were passed a genuine file, make sure it calls AC_INIT.
     test -f "$1" \
-      && _G_ac_init=`$SED "$_G_sed_no_comment" "$1" |grep AC_INIT`
+      && _G_ac_init=`$SED "$_G_sed_no_comment" "$1" |$GREP AC_INIT`
 
     # Otherwise it is not a genuine Autoconf input file.
     test -n "$_G_ac_init"
diff --git a/m4/argz.m4 b/m4/argz.m4
index 35de75d..f7bd7c0 100644
--- a/m4/argz.m4
+++ b/m4/argz.m4
@@ -1,6 +1,6 @@
 # Portability macros for glibc argz.                    -*- Autoconf -*-
 #
-#   Copyright (C) 2004-2007, 2011-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2004-2007, 2011-2014 Free Software Foundation, Inc.
 #   Written by Gary V. Vaughan <gary@gnu.org>
 #
 # This file is free software; the Free Software Foundation gives
diff --git a/m4/autobuild.m4 b/m4/autobuild.m4
index 3147b5b..00d8709 100644
--- a/m4/autobuild.m4
+++ b/m4/autobuild.m4
@@ -1,5 +1,5 @@
 # autobuild.m4 serial 7
-dnl Copyright (C) 2004, 2006-2013 Free Software Foundation, Inc.
+dnl Copyright (C) 2004, 2006-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 4bc6b22..900b172 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -1,6 +1,6 @@
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
-#   Copyright (C) 1996-2001, 2003-2013 Free Software Foundation, Inc.
+#   Copyright (C) 1996-2001, 2003-2014 Free Software Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 # This file is free software; the Free Software Foundation gives
diff --git a/m4/ltdl.m4 b/m4/ltdl.m4
index dbc91d9..7f30925 100644
--- a/m4/ltdl.m4
+++ b/m4/ltdl.m4
@@ -1,6 +1,6 @@
 # ltdl.m4 - Configure ltdl for the target system. -*-Autoconf-*-
 #
-#   Copyright (C) 1999-2008, 2011-2013 Free Software Foundation, Inc.
+#   Copyright (C) 1999-2008, 2011-2014 Free Software Foundation, Inc.
 #   Written by Thomas Tanner, 1999
 #
 # This file is free software; the Free Software Foundation gives
diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4
index 50c7723..de6520e 100644
--- a/m4/ltoptions.m4
+++ b/m4/ltoptions.m4
@@ -1,6 +1,6 @@
 # Helper functions for option handling.                    -*- Autoconf -*-
 #
-#   Copyright (C) 2004-2005, 2007-2009, 2011-2013 Free Software
+#   Copyright (C) 2004-2005, 2007-2009, 2011-2014 Free Software
 #   Foundation, Inc.
 #   Written by Gary V. Vaughan, 2004
 #
diff --git a/m4/ltsugar.m4 b/m4/ltsugar.m4
index 7cbc638..da4ac6b 100644
--- a/m4/ltsugar.m4
+++ b/m4/ltsugar.m4
@@ -1,6 +1,6 @@
 # ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
 #
-# Copyright (C) 2004-2005, 2007-2008, 2011-2013 Free Software
+# Copyright (C) 2004-2005, 2007-2008, 2011-2014 Free Software
 # Foundation, Inc.
 # Written by Gary V. Vaughan, 2004
 #
diff --git a/m4/ltversion.in b/m4/ltversion.in
index bf788a3..59c3ec4 100644
--- a/m4/ltversion.in
+++ b/m4/ltversion.in
@@ -1,6 +1,6 @@
 # ltversion.m4 -- version numbers			-*- Autoconf -*-
 #
-#   Copyright (C) 2004, 2011-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2004, 2011-2014 Free Software Foundation, Inc.
 #   Written by Scott James Remnant, 2004
 #
 # This file is free software; the Free Software Foundation gives
diff --git a/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4
index 59461e4..6975098 100644
--- a/m4/lt~obsolete.m4
+++ b/m4/lt~obsolete.m4
@@ -1,6 +1,6 @@
 # lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
 #
-#   Copyright (C) 2004-2005, 2007, 2009, 2011-2013 Free Software
+#   Copyright (C) 2004-2005, 2007, 2009, 2011-2014 Free Software
 #   Foundation, Inc.
 #   Written by Scott James Remnant, 2004.
 #
diff --git a/tests/am-subdir.at b/tests/am-subdir.at
index 5945426..28580f0 100644
--- a/tests/am-subdir.at
+++ b/tests/am-subdir.at
@@ -1,6 +1,6 @@
 # am-subdir.at -- libtool subdir-objects support              -*- Autotest -*-
 
-#   Copyright (C) 2004, 2008, 2011-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2004, 2008, 2011-2014 Free Software Foundation, Inc.
 #   Written by Gary V. Vaughan, 2004
 #
 #   This file is part of GNU Libtool.
@@ -78,9 +78,9 @@ void sub (void) { printf ("** This is libsub **\n"); }
 LT_AT_BOOTSTRAP([--copy], [-I m4], [ignore], [--add-missing])
 
 LT_AT_EXEC_CHECK([subdir/subdemo], 0, stdout)
-AT_CHECK([grep 'Welcome to GNU Libtool subdir-objects test' stdout],
+AT_CHECK([$GREP 'Welcome to GNU Libtool subdir-objects test' stdout],
 	 [], [ignore])
-AT_CHECK([grep 'This is libsub' stdout],
+AT_CHECK([$GREP 'This is libsub' stdout],
 	 [], [ignore])
 
 AT_CLEANUP
diff --git a/tests/archive-in-archive.at b/tests/archive-in-archive.at
index 3522c26..2cd7fcc 100644
--- a/tests/archive-in-archive.at
+++ b/tests/archive-in-archive.at
@@ -1,6 +1,6 @@
 # dmacks.at --  test for dmacks bug  -*- Autotest -*-
 #
-#   Copyright (C) 2007-2008, 2010-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2007-2008, 2010-2014 Free Software Foundation, Inc.
 #   Written by Peter O'Gorman, 2007
 #
 #   This file is part of GNU Libtool.
@@ -53,7 +53,7 @@ AT_CHECK([$LIBTOOL --mode=link --tag=CC --tag=disable-shared $CC $CFLAGS $LDFLAG
 AT_CHECK([$LIBTOOL --mode=install cp libbar.la $thisdir], [], [ignore], [ignore])
 eval `$EGREP '^(old_library)=' < libbar.la`
 libbar=$old_library
-AT_CHECK([$AR -t $libbar | grep $libfoo],[1],[ignore],[ignore])
-AT_CHECK([$AR -t $libbar | grep foo.$OBJEXT],[],[ignore],[ignore])
-AT_CHECK([$AR -t $libbar | grep bar.$OBJEXT],[],[ignore],[ignore])
+AT_CHECK([$AR -t $libbar | $GREP $libfoo],[1],[ignore],[ignore])
+AT_CHECK([$AR -t $libbar | $GREP foo.$OBJEXT],[],[ignore],[ignore])
+AT_CHECK([$AR -t $libbar | $GREP bar.$OBJEXT],[],[ignore],[ignore])
 AT_CLEANUP
diff --git a/tests/bindir.at b/tests/bindir.at
index cc9c24a..a4d9eaf 100644
--- a/tests/bindir.at
+++ b/tests/bindir.at
@@ -1,6 +1,6 @@
 # bindir.at -  Test the -bindir option
 #
-#   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 #   Written by Dave Korn, 2009
 #
 #   This file is part of GNU Libtool.
@@ -122,7 +122,7 @@ return 0;
 
 
 curdir=`pwd`
-eval "`$LIBTOOL --config | grep '^objdir='`"
+eval "`$LIBTOOL --config | $GREP '^objdir='`"
 
 AT_CHECK([$LIBTOOL --mode=compile --tag=CC $CC -c -o foo.lo $CPPFLAGS $CFLAGS foo.c],[0],[ignore],[ignore])
 AT_CHECK([$LIBTOOL --mode=compile --tag=CC $CC -c -o baz.lo $CPPFLAGS $CFLAGS baz.c],[0],[ignore],[ignore])
@@ -181,7 +181,7 @@ case $host_os in
     ;;
 esac
 
-eval "`$LIBTOOL --config | grep '^build_libtool_libs='`"
+eval "`$LIBTOOL --config | $GREP '^build_libtool_libs='`"
 AT_CHECK([test yes = "$build_libtool_libs" || exit 77])
 
 ####
diff --git a/tests/cdemo.at b/tests/cdemo.at
index 8f045ea..7b7963b 100644
--- a/tests/cdemo.at
+++ b/tests/cdemo.at
@@ -1,6 +1,6 @@
 # cdemo.at -- Using Automake to build a program and library -*- Autotest -*-
 #
-#   Copyright (C) 2003-2004, 2011-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2003-2004, 2011-2014 Free Software Foundation, Inc.
 #   Written by Gary V. Vaughan, 2003
 #
 #   This file is part of GNU Libtool.
@@ -186,7 +186,7 @@ LT_AT_CHECK_CONFIG([--disable-static])
 AT_CHECK([$EGREP "^allow_undefined_flag=.\{0,1\}unsupported.\{0,1\}$" libtool && (exit 77)],
           1, [ignore])
 
-sed 's|allow_undefined=no|allow_undefined=yes|g' libtool > ltnew && mv -f ltnew libtool
+$SED 's|allow_undefined=no|allow_undefined=yes|g' libtool > ltnew && mv -f ltnew libtool
 
 LT_AT_CHECK_EXECUTE([], [./cdemo])
 
diff --git a/tests/cmdline_wrap.at b/tests/cmdline_wrap.at
index 42ce51b..010368c 100644
--- a/tests/cmdline_wrap.at
+++ b/tests/cmdline_wrap.at
@@ -1,6 +1,6 @@
 # cmdline_wrap.at -- run tests with low max_cmd_len           -*- Autotest -*-
 
-#   Copyright (C) 2007, 2009, 2011-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2007, 2009, 2011-2014 Free Software Foundation, Inc.
 #   Written by Ralf Wildenhues, 2007
 #
 #   This file is part of GNU Libtool.
@@ -27,10 +27,13 @@
 
 AT_SETUP([Run tests with low max_cmd_len])
 AT_KEYWORDS([recursive expensive])
+dnl If we already have failures, then reruns will fail too!
+fail_list=`for f in ?/fail ??/fail ???/fail ????/fail; do echo $f; end`
+AT_CHECK([test -z "$fail_list" || (exit 77)])
 m4_ifdef([AT_CAPTURE_FILE],
 [AT_CAPTURE_FILE([testsuite.log])])
 
-sed 's|max_cmd_len=.*|max_cmd_len="24"|' < $LIBTOOL > libtool
+$SED 's|max_cmd_len=.*|max_cmd_len="24"|' < $LIBTOOL > libtool
 chmod +x libtool
 LIBTOOL=`pwd`/libtool
 export LIBTOOL
diff --git a/tests/configure-iface.at b/tests/configure-iface.at
index 90af64d..a75fb4a 100644
--- a/tests/configure-iface.at
+++ b/tests/configure-iface.at
@@ -1,6 +1,6 @@
 # configure-iface.at -- test ltdl configure interface         -*- Autotest -*-
 #
-#   Copyright (C) 2007-2008, 2011-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2007-2008, 2011-2014 Free Software Foundation, Inc.
 #   Written by Gary V. Vaughan, 2007
 #
 #   This file is part of GNU Libtool.
@@ -320,7 +320,7 @@ print-ltdl:
 
 LT_AT_BOOTSTRAP([--ltdl], [-I libltdl/m4], [ignore], [ignore], [], [], [ignore])
 AT_CHECK([$MAKE print-ltdl], [], [stdout], [ignore])
-AT_CHECK([grep libltdl/libltdlc.la stdout], [], [ignore])
+AT_CHECK([$GREP libltdl/libltdlc.la stdout], [], [ignore])
 
 AT_CLEANUP
 
diff --git a/tests/convenience.at b/tests/convenience.at
index b0d4b59..77a03cd 100644
--- a/tests/convenience.at
+++ b/tests/convenience.at
@@ -1,6 +1,6 @@
 # convenience.at -- testing C convenience archives            -*- Autotest -*-
 
-#   Copyright (C) 2005, 2007-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2005, 2007-2014 Free Software Foundation, Inc.
 #   Written by Ralf Wildenhues, 2005
 #
 #   This file is part of GNU Libtool.
@@ -259,8 +259,16 @@ public class A$i {
 };
 EOF
 
-  $LIBTOOL --tag=GCJ --mode=compile $GCJ $GCJFLAGS -c foo$i.java
-  $LIBTOOL --tag=GCJ --mode=compile $GCJ $GCJFLAGS -c A$i.java
+  # Workaround http://gcc.gnu.org/bugzilla/show_bug.cgi?id=42143
+  # Some 4.3.x and 4.4.x releases of gcj insert a spurious dummy symbol
+  # into every object file when compiling directly from .java to .o, so
+  # we have to make .class files first, and then compile those to native
+  # objects:
+  $GCJ $GCJFLAGS -C foo$i.java
+  $GCJ $GCJFLAGS -C A$i.java
+
+  $LIBTOOL --tag=GCJ --mode=compile $GCJ $GCJFLAGS -c foo$i.class
+  $LIBTOOL --tag=GCJ --mode=compile $GCJ $GCJFLAGS -c A$i.class
   $LIBTOOL --tag=GCJ --mode=link $GCJ $GCJFLAGS $LDFLAGS -o liba$i.la A$i.lo
 done
 AT_CHECK([$LIBTOOL --tag=GCJ --mode=link $GCJ $GCJFLAGS $LDFLAGS -o liba12.la liba1.la liba2.la -rpath /notexist],
diff --git a/tests/ctor.at b/tests/ctor.at
index c6360b1..0b5e8c6 100644
--- a/tests/ctor.at
+++ b/tests/ctor.at
@@ -1,6 +1,6 @@
 # ctor.at -- Test constructors via C++                        -*- Autotest -*-
 #
-#   Copyright (C) 2007-2008, 2011-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2007-2008, 2011-2014 Free Software Foundation, Inc.
 #   Written by Noah Misch, 2007
 #
 #   This file is part of GNU Libtool.
diff --git a/tests/cwrapper.at b/tests/cwrapper.at
index 5588f26..6a2292a 100644
--- a/tests/cwrapper.at
+++ b/tests/cwrapper.at
@@ -1,6 +1,6 @@
 # cwrapper.at -- test cwrapper compliance with standards -*- Autotest -*-
 
-#   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 #   Written by Charles Wilson, 2009
 #
 #   This file is part of GNU Libtool.
@@ -26,7 +26,7 @@ AT_SETUP([cwrapper for uninstalled executables])
 AT_KEYWORDS([libtool])
 
 # make sure existing libtool is configured for shared libraries
-AT_CHECK([$LIBTOOL --features | grep 'disable shared libraries' && exit 77],
+AT_CHECK([$LIBTOOL --features | $GREP 'disable shared libraries' && exit 77],
 	 [1], [ignore])
 
 AT_DATA([trivial.c],
@@ -57,7 +57,7 @@ orig_CFLAGS=$CFLAGS
 orig_LIBTOOL=$LIBTOOL
 for restrictive_flags in '-Wall -Werror' '-std=c89 -Wall -Werror' '-std=c99 -Wall -Werror'; do
   CFLAGS="$orig_CFLAGS $restrictive_flags"
-  sed "s/LTCFLAGS=.*/&' $restrictive_flags'/" < "$orig_LIBTOOL" > ./libtool
+  $SED "s/LTCFLAGS=.*/&' $restrictive_flags'/" < "$orig_LIBTOOL" > ./libtool
   chmod +x libtool
   LIBTOOL=./libtool
 
@@ -98,7 +98,7 @@ AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o usea$EXEEXT usea.$OBJEXT
          [], [ignore], [ignore])
 LT_AT_EXEC_CHECK([./usea], [0], [ignore], [stderr], [--lt-debug])
 LT_AT_UNIFY_NL([stderr])
-AT_CHECK([grep 'libtool wrapper' stderr], [0], [ignore], [ignore])
+AT_CHECK([$GREP 'libtool wrapper' stderr], [0], [ignore], [ignore])
 
 
 # Test compile-time activation of wrapper debugging.
@@ -106,8 +106,8 @@ AT_CHECK([grep 'libtool wrapper' stderr], [0], [ignore], [ignore])
 # if necessary -- even though the loop by design executes only once.
 for debugwrapper_flags in '-DLT_DEBUGWRAPPER'; do
   CFLAGS="$orig_CFLAGS $debugwrapper_flags"
-  sed -e "s/LTCFLAGS=.*/&' $debugwrapper_flags'/" \
-      -e "s/^lt_option_debug=/lt_option_debug=1/" \
+  $SED -e "s/LTCFLAGS=.*/&' $debugwrapper_flags'/" \
+       -e "s/^lt_option_debug=/lt_option_debug=1/" \
     < "$orig_LIBTOOL" > ./libtool
   LIBTOOL=./libtool
 
@@ -128,7 +128,7 @@ for debugwrapper_flags in '-DLT_DEBUGWRAPPER'; do
            [], [ignore], [ignore])
   LT_AT_EXEC_CHECK([./usea], [0], [ignore], [stderr], [])
   LT_AT_UNIFY_NL([stderr])
-  AT_CHECK([grep 'libtool wrapper' stderr], [0], [ignore], [ignore])
+  AT_CHECK([$GREP 'libtool wrapper' stderr], [0], [ignore], [ignore])
 done
 
 
@@ -177,7 +177,7 @@ for dirpath in $PATH; do
 done
 IFS=$save_IFS
 
-until $ECHO "PATH=$PATH" | grep 'PATH=.\{250\}'; do
+until $ECHO "PATH=$PATH" | $GREP 'PATH=.\{250\}'; do
   PATH=$PATH$PATH_SEPARATOR$dirpath
 done
 export PATH
@@ -190,9 +190,9 @@ AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -no-fast-install ]dnl
 AT_CHECK([test -f "$objdir/lt-usea.c" || exit 77])
 
 # Try to make sure the test is relevant.
-AT_CHECK([grep ' *fputs' $objdir/lt-usea.c > /dev/null])
+AT_CHECK([$GREP ' *fputs' $objdir/lt-usea.c > /dev/null])
 # Check for no overly long fputs.
-AT_CHECK([grep ' *fputs.\{250\}' $objdir/lt-usea.c], [1])
+AT_CHECK([$GREP ' *fputs.\{250\}' $objdir/lt-usea.c], [1])
 
 
 AT_CLEANUP
@@ -202,7 +202,7 @@ AT_SETUP([cwrapper and installed shared libraries])
 AT_KEYWORDS([libtool])
 
 # make sure existing libtool is configured for shared libraries
-AT_CHECK([$LIBTOOL --features | grep 'enable shared libraries' || exit 77],
+AT_CHECK([$LIBTOOL --features | $GREP 'enable shared libraries' || exit 77],
 	 [], [ignore])
 
 LDFLAGS="$LDFLAGS -no-undefined"
diff --git a/tests/darwin.at b/tests/darwin.at
index 3ace493..9e4bd47 100644
--- a/tests/darwin.at
+++ b/tests/darwin.at
@@ -1,6 +1,6 @@
 # darwin.at - tests specific to Mac OS X
 #
-#   Copyright (C) 2008-2009, 2011-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2008-2009, 2011-2014 Free Software Foundation, Inc.
 #   Written by Peter O'Gorman, 2008
 #
 #   This file is part of GNU Libtool.
@@ -74,7 +74,7 @@ if test $# != 1; then
                   exit 1
 fi
 
-echo $1 | sed "s|^.*/||"
+echo $1 | $SED "s|^.*/||"
 ]])
 
 chmod +x bin/basename
@@ -114,7 +114,7 @@ cp bar.c baz.c
 
 objects=
 for obj in 1 2 3 4 5 6 7 8; do
-  sed "s/foo/foo$obj/" < foo.c > foo$obj.c
+  $SED "s/foo/foo$obj/" < foo.c > foo$obj.c
   AT_CHECK([$LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c foo$obj.c],
 	   [], [ignore], [ignore])
   objects="$objects foo$obj.lo"
@@ -145,7 +145,7 @@ echo stamp > $lockfile
 AT_CHECK([$LIBTOOL --dry-run --mode=link $CC $CFLAGS $LDFLAGS ]dnl
 	 [ -o libbar.la bar.lo -rpath /foo libfoo.la],
 	 [], [ignore], [ignore])
-AT_CHECK([grep stamp $lockfile], [], [ignore])
+AT_CHECK([$GREP stamp $lockfile], [], [ignore])
 
 AT_CLEANUP
 
@@ -187,7 +187,7 @@ AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS ]dnl
 AT_CHECK([echo quit | $LIBTOOL --mode=execute gdb main],
 	 [ignore], [ignore], [stderr])
 
-AT_CHECK([grep 'Could not find object file' stderr],[1],[ignore],[ignore])
+AT_CHECK([$GREP 'Could not find object file' stderr],[1],[ignore],[ignore])
 
 AT_XFAIL_IF([
 eval "`$LIBTOOL --config | $EGREP '^(whole_archive_flag_spec)='`"
@@ -201,7 +201,7 @@ rm -rf .libs/*.dSYM
 
 AT_CHECK([echo quit | $LIBTOOL --mode=execute gdb main],
 	 [ignore], [ignore], [stderr])
-AT_CHECK([grep 'Could not find object file' stderr],[1],[ignore],[ignore])
+AT_CHECK([$GREP 'Could not find object file' stderr],[1],[ignore],[ignore])
 
 AT_CLEANUP
 
@@ -234,7 +234,7 @@ AT_SETUP([darwin can lt_dlopen .dylib and .so files])
 AT_KEYWORDS([libltdl dylib])
 
 # This test requires shared library support.
-AT_CHECK([$LIBTOOL --features | grep 'enable shared libraries' || exit 77],
+AT_CHECK([$LIBTOOL --features | $GREP 'enable shared libraries' || exit 77],
 	 [], [ignore])
 
 eval `$LIBTOOL --config | $EGREP '^shrext_cmds='`
@@ -437,10 +437,10 @@ rm $libdir/libsimple-dylib.la
 for dir in inst/lib "$libdir"; do
   LT_AT_EXEC_CHECK([./ltdl-loader], [], [stdout], [ignore],
 	    [$dir/simple-module World])
-  AT_CHECK([grep "Hello, World" stdout], [], [ignore])
+  AT_CHECK([$GREP "Hello, World" stdout], [], [ignore])
   LT_AT_EXEC_CHECK([./ltdl-loader], [], [stdout], [ignore],
 	    [$dir/libsimple-dylib World])
-  AT_CHECK([grep "Hello, World" stdout], [], [ignore])
+  AT_CHECK([$GREP "Hello, World" stdout], [], [ignore])
 done
 
 AT_CLEANUP
diff --git a/tests/demo.at b/tests/demo.at
index c0a1486..f7a36a0 100644
--- a/tests/demo.at
+++ b/tests/demo.at
@@ -1,6 +1,6 @@
 # demo.at -- Linking and loading. -*- Autotest -*-
 #
-#   Copyright (C) 2003-2004, 2011-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2003-2004, 2011-2014 Free Software Foundation, Inc.
 #   Written by Gary V. Vaughan, 2003
 #
 #   This file is part of GNU Libtool.
@@ -555,18 +555,18 @@ CLEANFILES = $(hardcode_tests)
 
 # Unfortunately, in order to test libtool thoroughly, we need access
 # to its private directory.
-objdir = `$(LIBTOOL) --config | sed -n -e 's/^objdir=\(.*\)$$/\1/p'`
+objdir = `$(LIBTOOL) --config | $(SED) -n -e 's/^objdir=\(.*\)$$/\1/p'`
 
 # Test programs to see what gets hardcoded.
 .PHONY: hardcode
 hardcode: $(hardcode_tests)
 SET_HARDCODE_FLAGS = \
-  eval `$(LIBTOOL) --config | sed -n -e '/^hardcode_.*=/p; /^wl=/p'`
+  eval `$(LIBTOOL) --config | $(SED) -n -e '/^hardcode_.*=/p; /^wl=/p'`
 hc-direct: $(hell_OBJECTS) $(hell_DEPENDENCIES) $(libdir)/libhello.la
 	@rm -f hc-direct
 	@echo "You may ignore any linking errors from the following command:"
 	@shlib=./$(objdir)/libhello.a; \
-	  eval "`grep '^library_names' libhello.la`"; \
+	  eval "`$(GREP) '^library_names' libhello.la`"; \
 	  for lib in $$library_names; do \
 	    shlib="./$(objdir)/$$lib"; \
 	  done; \
@@ -593,7 +593,7 @@ hc-libpath: $(hell_OBJECTS) $(hell_DEPENDENCIES) $(libdir)/libhello.la
 	@rm -f hc-libpath
 	@echo "You may ignore any linking errors from the following command:"
 	@$(SET_HARDCODE_FLAGS); \
-	  eval `$(LIBTOOL) --config | grep '^shlibpath_var='`; \
+	  eval `$(LIBTOOL) --config | $(GREP) '^shlibpath_var='`; \
 	  libdir=$(libdir); \
 	  flag=`eval echo \"$$hardcode_libdir_flag_spec\"`; \
 	  echo "$$shlibpath_var=./$(objdir) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(hell_OBJECTS) -lhello $(LIBS) $(LIBM) $$flag || echo unsupported > $@"; \
@@ -668,7 +668,7 @@ for file in hc-*; do
   elif $FGREP "$objdir" $file > /dev/null 2>&1; then
     # We retry fgrep without tr, in case the above lead to a false negative.
     hardcoded=yes
-  elif (sed -e '1!d' $file | grep 'unsupported') >/dev/null 2>&1; then
+  elif ($SED -e '1!d' $file | $GREP 'unsupported') >/dev/null 2>&1; then
     hardcoded=unsupported
   fi
 
diff --git a/tests/depdemo.at b/tests/depdemo.at
index 37e822b..ae83277 100644
--- a/tests/depdemo.at
+++ b/tests/depdemo.at
@@ -1,6 +1,6 @@
 # depdemo.at -- Library interdependencies		 -*- Autotest -*-
 #
-#   Copyright (C) 2003-2004, 2011-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2003-2004, 2011-2014 Free Software Foundation, Inc.
 #   Written by Gary V. Vaughan, 2003
 #
 #   This file is part of GNU Libtool.
diff --git a/tests/deplib-in-subdir.at b/tests/deplib-in-subdir.at
index 73713d7..3d7141d 100644
--- a/tests/deplib-in-subdir.at
+++ b/tests/deplib-in-subdir.at
@@ -1,6 +1,6 @@
 # deplib-in-subdir.at --                         -*- Autotest -*-
 
-#   Copyright (C) 2010-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2010-2014 Free Software Foundation, Inc.
 #
 #   This file is part of GNU Libtool.
 #
diff --git a/tests/deplibs-ident.at b/tests/deplibs-ident.at
index 161c7a5..9c5e823 100644
--- a/tests/deplibs-ident.at
+++ b/tests/deplibs-ident.at
@@ -1,6 +1,6 @@
 # deplibs-ident.at -- detecting identical deplibs              -*- Autotest -*-
 
-#   Copyright (C) 2005, 2007-2008, 2011-2013 Free Software Foundation,
+#   Copyright (C) 2005, 2007-2008, 2011-2014 Free Software Foundation,
 #   Inc.
 #   Written by Ralf Wildenhues, 2005
 #
diff --git a/tests/deplibs-mingw.at b/tests/deplibs-mingw.at
index eb449fc..c975cd6 100644
--- a/tests/deplibs-mingw.at
+++ b/tests/deplibs-mingw.at
@@ -1,6 +1,6 @@
 # deplibs-mingw.at --                         -*- Autotest -*-
 
-#   Copyright (C) 2010-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2010-2014 Free Software Foundation, Inc.
 #
 #   This file is part of GNU Libtool.
 #
diff --git a/tests/destdir.at b/tests/destdir.at
index 978438f..54b9b61 100644
--- a/tests/destdir.at
+++ b/tests/destdir.at
@@ -1,6 +1,6 @@
 # destdir.at -- test various DESTDIR issues                   -*- Autotest -*-
 
-#   Copyright (C) 2006-2007, 2011-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2006-2007, 2011-2014 Free Software Foundation, Inc.
 #   Written by Ralf Wildenhues, 2006
 #
 #   This file is part of GNU Libtool.
@@ -27,7 +27,7 @@ AT_BANNER([DESTDIR tests])
 # Common setup for the next few tests.
 m4_pushdef([_LT_DIRSETUP],
 [# DESTDIR installs do not work with relink at install time.
-AT_XFAIL_IF([eval `$LIBTOOL --config | grep '^fast_install='`
+AT_XFAIL_IF([eval `$LIBTOOL --config | $GREP '^fast_install='`
            case $fast_install in no) :;; *) false;; esac])
 LDFLAGS="$LDFLAGS -no-undefined"
 if test -n "$we_are_on_a_safe_system"; then # let's read shorter cmdlines.
diff --git a/tests/dlloader-api.at b/tests/dlloader-api.at
index 37a928c..9418b3d 100644
--- a/tests/dlloader-api.at
+++ b/tests/dlloader-api.at
@@ -1,6 +1,6 @@
 # dlloader.at -- test dlloader functionality                -*- Autotest -*-
 #
-#   Copyright (C) 2010-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2010-2014 Free Software Foundation, Inc.
 #   This file is part of GNU Libtool.
 #
 # GNU Libtool is free software; you can redistribute it and/or
diff --git a/tests/dumpbin-symbols.at b/tests/dumpbin-symbols.at
index 39a964c..554c295 100644
--- a/tests/dumpbin-symbols.at
+++ b/tests/dumpbin-symbols.at
@@ -1,6 +1,6 @@
 # dumpbin-symbols.at -- libtool "dumpbin -symbols" support    -*- Autotest -*-
 
-#   Copyright (C) 2010-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2010-2014 Free Software Foundation, Inc.
 #
 #   This file is part of GNU Libtool.
 #
@@ -39,7 +39,7 @@ int some_variable = 0;
 
 AT_CHECK([$CC $CPPFLAGS $CFLAGS -c variable.c], [], [ignore], [ignore])
 AT_CHECK([$NM variable.$OBJEXT], [], [stdout], [ignore])
-AT_CHECK([grep 'External.*some_variable' stdout || exit 77], [], [ignore])
+AT_CHECK([$GREP 'External.*some_variable' stdout || exit 77], [], [ignore])
 
 eval `$LIBTOOL --config | $EGREP '^(global_symbol_pipe)='`
 
@@ -106,6 +106,6 @@ String Table Size = 0x11 bytes
 # Check if the _convenience symbol from section SECT3 in conv.lib is
 # present even if section SECT3 in foo.obj is hidden.
 AT_CHECK([< dumpbin-output eval "$global_symbol_pipe"], [], [stdout])
-AT_CHECK([grep convenience stdout], [], [ignore])
+AT_CHECK([$GREP convenience stdout], [], [ignore])
 
 AT_CLEANUP
diff --git a/tests/duplicate_conv.at b/tests/duplicate_conv.at
index 2e7a3a4..cf1ba6a 100644
--- a/tests/duplicate_conv.at
+++ b/tests/duplicate_conv.at
@@ -1,6 +1,6 @@
 # duplicate_conv.at -- duplicate convenience archive names   -*- Autotest -*-
 
-#   Copyright (C) 2006, 2008, 2011-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2006, 2008, 2011-2014 Free Software Foundation, Inc.
 #   Written by Ralf Wildenhues, 2006
 #
 #   This file is part of GNU Libtool.
@@ -25,7 +25,7 @@
 AT_SETUP([duplicate convenience archive names])
 AT_KEYWORDS([libtool])
 
-eval `$LIBTOOL --config | sed -n '/^reload_cmds=/,/^$/p'`
+eval `$LIBTOOL --config | $SED -n '/^reload_cmds=/,/^$/p'`
 
 # We create two convenience archives with the same name, and _also_
 # containing an object with the same name.  This is necessary to detect
diff --git a/tests/duplicate_deps.at b/tests/duplicate_deps.at
index 56471c4..02b6db0 100644
--- a/tests/duplicate_deps.at
+++ b/tests/duplicate_deps.at
@@ -1,6 +1,6 @@
 # duplicate_deps.at -- preserve duplicate convenience deps    -*- Autotest -*-
 
-#   Copyright (C) 2006-2008, 2011-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2006-2008, 2011-2014 Free Software Foundation, Inc.
 #   Written by Ralf Wildenhues, 2006
 $
 #   This file is part of GNU Libtool.
diff --git a/tests/duplicate_members.at b/tests/duplicate_members.at
index 2555244..bf05a05 100755
--- a/tests/duplicate_members.at
+++ b/tests/duplicate_members.at
@@ -1,6 +1,6 @@
 # duplicate_members.at -- duplicate members in archive tests  -*- Autotest -*-
 
-#   Copyright (C) 2005, 2007-2009, 2011-2013 Free Software Foundation,
+#   Copyright (C) 2005, 2007-2009, 2011-2014 Free Software Foundation,
 #   Inc.
 #   Written by Alexandre Oliva & Peter O'Gorman, 2005
 #
@@ -27,7 +27,7 @@ AT_SETUP([duplicate members in archive tests])
 AT_KEYWORDS([libtool])
 
 # we don't want to use whole_archive_flag_spec, even if available
-sed -e 's|^whole_archive_flag_spec=.*|whole_archive_flag_spec=|g' < $LIBTOOL > libtool
+$SED -e 's|^whole_archive_flag_spec=.*|whole_archive_flag_spec=|g' < $LIBTOOL > libtool
 
 chmod +x ./libtool
 LIBTOOL=./libtool
diff --git a/tests/early-libtool.at b/tests/early-libtool.at
index 7c59594..2bfd0ea 100644
--- a/tests/early-libtool.at
+++ b/tests/early-libtool.at
@@ -1,6 +1,6 @@
 # early-libtool.at -- early libtool script generation         -*- Autotest -*-
 
-#   Copyright (C) 2005-2008, 2011-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2005-2008, 2011-2014 Free Software Foundation, Inc.
 #   Written by Gary V. Vaughan, 2005
 #
 #   This file is part of GNU Libtool.
@@ -112,8 +112,8 @@ LT_AT_CONFIGURE
 LT_AT_MAKE
 
 LT_AT_EXEC_CHECK([./hell], [0], [stdout])
-AT_CHECK([grep 'Welcome to GNU Hell' stdout], [], [ignore])
-AT_CHECK([grep 'This is not GNU Hello.' stdout],
+AT_CHECK([$GREP 'Welcome to GNU Hell' stdout], [], [ignore])
+AT_CHECK([$GREP 'This is not GNU Hello.' stdout],
 	 [], [ignore])
 
 AT_CLEANUP
@@ -219,8 +219,8 @@ LT_AT_CONFIGURE
 LT_AT_MAKE
 
 LT_AT_EXEC_CHECK([./hell], [0], [stdout])
-AT_CHECK([grep 'Welcome to GNU Hell' stdout], [], [ignore])
-AT_CHECK([grep 'This is not GNU Hello.' stdout], [], [ignore])
+AT_CHECK([$GREP 'Welcome to GNU Hell' stdout], [], [ignore])
+AT_CHECK([$GREP 'This is not GNU Hello.' stdout], [], [ignore])
 
 # Make sure config.status --recheck updates the libtool script
 rm libtool
diff --git a/tests/exceptions.at b/tests/exceptions.at
index 3eda9ef..35e5e6a 100644
--- a/tests/exceptions.at
+++ b/tests/exceptions.at
@@ -1,6 +1,6 @@
 # exception.at -- test C++ exception handling with libtool  -*- Autotest -*-
 #
-#   Copyright (C) 2010-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2010-2014 Free Software Foundation, Inc.
 #
 #   This file is part of GNU Libtool.
 #
diff --git a/tests/execute-mode.at b/tests/execute-mode.at
index 0b62238..52fca77 100644
--- a/tests/execute-mode.at
+++ b/tests/execute-mode.at
@@ -1,6 +1,6 @@
 # execute-mode.at -- libtool --mode=execute             -*- Autotest -*-
 #
-#   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 #   Written by Ralf Wildenhues, 2008
 #
 #   This file is part of GNU Libtool.
@@ -194,28 +194,28 @@ do
   AT_CHECK([$LIBTOOL --mode=execute ./foo abc "$arg1" "$arg2" xyz], [], [stdout], [ignore])
   AT_CHECK([$FGREP "$arg1" stdout], [], [ignore])
   AT_CHECK([test -z "$arg2" || $FGREP "$arg2" stdout], [], [ignore])
-  AT_CHECK([test `sed -n '/^abc$/,/^xyz$/p' stdout | wc -l` -eq 4])
+  AT_CHECK([test `$SED -n '/^abc$/,/^xyz$/p' stdout | wc -l` -eq 4])
   AT_CHECK([$LIBTOOL --mode=execute ./lt-wrapper abc "$arg1" "$arg2" xyz </dev/null], [], [stdout])
   AT_CHECK([$FGREP "$arg1" stdout], [], [ignore])
   AT_CHECK([test -z "$arg2" || $FGREP "$arg2" stdout], [], [ignore])
-  AT_CHECK([test `sed -n '/^abc$/,/^xyz$/p' stdout | wc -l` -eq 4])
+  AT_CHECK([test `$SED -n '/^abc$/,/^xyz$/p' stdout | wc -l` -eq 4])
   AT_CHECK([$LIBTOOL --mode=execute ./foo lt-wrapper abc "$arg1" "$arg2" xyz], [], [stdout])
   AT_CHECK([$FGREP "$arg1" stdout], [], [ignore])
   AT_CHECK([test -z "$arg2" || $FGREP "$arg2" stdout], [], [ignore])
-  AT_CHECK([test `sed -n '/^abc$/,/^xyz$/p' stdout | wc -l` -eq 4])
+  AT_CHECK([test `$SED -n '/^abc$/,/^xyz$/p' stdout | wc -l` -eq 4])
   AT_CHECK([$LIBTOOL --mode=execute ./main$EXEEXT abc "$arg1" "$arg2" xyz], [], [stdout])
   AT_CHECK([$FGREP "$arg1" stdout], [], [ignore])
   AT_CHECK([test -z "$arg2" || $FGREP "$arg2" stdout], [], [ignore])
   # Do not match EOL here, cross setups may have an extra \r here.
-  AT_CHECK([test `sed -n '/^abc/,/^xyz/p' stdout | wc -l` -eq 4])
+  AT_CHECK([test `$SED -n '/^abc/,/^xyz/p' stdout | wc -l` -eq 4])
   arg1=
 done
 
 # Check that .la files are not transformed by the wrapper searching loop.
 AT_CHECK([$LIBTOOL --mode=execute echo ./main$EXEEXT liba.lo libfakelib.la], [], [stdout])
 # This could be .libs/lt-main or similar (or just plain 'main').
-AT_CHECK([grep main stdout], [], [ignore])
-AT_CHECK([grep liba.lo stdout], [], [ignore])
-AT_CHECK([grep libfakelib.la stdout], [], [ignore])
+AT_CHECK([$GREP main stdout], [], [ignore])
+AT_CHECK([$GREP liba.lo stdout], [], [ignore])
+AT_CHECK([$GREP libfakelib.la stdout], [], [ignore])
 
 AT_CLEANUP
diff --git a/tests/exeext.at b/tests/exeext.at
index d84a777..25b599e 100644
--- a/tests/exeext.at
+++ b/tests/exeext.at
@@ -1,6 +1,6 @@
 # exeext.at -- ensure that exeext handling works  -*- Autotest -*-
 #
-#   Copyright (C) 2010-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2010-2014 Free Software Foundation, Inc.
 #   Written by Peter Rosin
 #
 #   This file is part of GNU Libtool.
diff --git a/tests/export-def.at b/tests/export-def.at
index 55a513a..772c76b 100755
--- a/tests/export-def.at
+++ b/tests/export-def.at
@@ -1,6 +1,6 @@
 # export-def.at -- test module-definition files              -*- Autotest -*-
 
-#   Copyright (C) 2013 Free Software Foundation, Inc.
+#   Copyright (C) 2013-2014 Free Software Foundation, Inc.
 #   Written by Peter Rosin, 2013
 #
 #   This file is part of GNU Libtool.
@@ -25,7 +25,7 @@
 AT_SETUP([export from a DLL with a .def file])
 AT_KEYWORDS([libtool])
 
-AT_CHECK([$LIBTOOL --features | grep 'disable shared libraries' && (exit 77)],
+AT_CHECK([$LIBTOOL --features | $GREP 'disable shared libraries' && (exit 77)],
 	 [1], [ignore])
 eval `$LIBTOOL --config | $EGREP '^(shrext_cmds|libname_spec|soname_spec)='`
 
diff --git a/tests/export.at b/tests/export.at
index e79105f..5e1edaf 100644
--- a/tests/export.at
+++ b/tests/export.at
@@ -1,6 +1,6 @@
 # export.at -- test symbol exports                           -*- Autotest -*-
 
-#   Copyright (C) 2007-2008, 2011-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2007-2008, 2011-2014 Free Software Foundation, Inc.
 #   Written by Ralf Wildenhues, 2007
 #
 #   This file is part of GNU Libtool.
@@ -25,9 +25,9 @@
 AT_SETUP([Export test])
 AT_KEYWORDS([libtool])
 
-AT_CHECK([$LIBTOOL --features | grep 'disable shared libraries' && (exit 77)],
+AT_CHECK([$LIBTOOL --features | $GREP 'disable shared libraries' && (exit 77)],
 	 [1], [ignore])
-AT_CHECK([eval `$LIBTOOL --config | sed -n '/^archive_expsym_cmds=/,/^$/p'`
+AT_CHECK([eval `$LIBTOOL --config | $SED -n '/^archive_expsym_cmds=/,/^$/p'`
 	  test -n "$archive_expsym_cmds" || echo false >can-hide
 	  case $archive_expsym_cmds in
 	  *-retain-symbols-file*) echo false >can-hide ;;
diff --git a/tests/f77demo.at b/tests/f77demo.at
index ac96b97..da8e324 100644
--- a/tests/f77demo.at
+++ b/tests/f77demo.at
@@ -1,6 +1,6 @@
 # f77demo.at -- Fortran 77 language support.		-*- Autotest -*-
 #
-#   Copyright (C) 2003, 2005-2006, 2011-2013 Free Software Foundation,
+#   Copyright (C) 2003, 2005-2006, 2011-2014 Free Software Foundation,
 #   Inc.
 #   Written by Eric Lindahl, 2002
 #   Written by Gary V. Vaughan, 2003
@@ -63,17 +63,13 @@ ACLOCAL_AMFLAGS = -I m4
 lib_LTLIBRARIES = libfoo.la libmix.la libfoo2.la libfoo3.la
 
 libfoo_la_SOURCES = foof.f
-libfoo_la_LDFLAGS = -no-undefined
 libfoo_la_LIBADD = libfoo2.la
 
 libfoo2_la_SOURCES = foof2.f
-libfoo2_la_LDFLAGS = -no-undefined
 
 libfoo3_la_SOURCES = foof3.f
-libfoo3_la_LDFLAGS = -no-undefined
 
 libmix_la_SOURCES = foof.f foof2.f fooc.c
-libmix_la_LDFLAGS = -no-undefined
 
 noinst_HEADERS = foo.h
 
@@ -263,7 +259,7 @@ LT_AT_HOST_DATA([expout],
 LT_AT_EXEC_CHECK([./fprogram], 0, [stdout])
 
 # A weaker output content check that is agnostic to the issues above.
-AT_CHECK([grep 'Welcome to GNU libtool Fortran demo!' stdout],
+AT_CHECK([$GREP 'Welcome to GNU libtool Fortran demo!' stdout],
          [0], [ignore])
 
 # Similarly, we can't reliably compare actual output with the following.
@@ -284,7 +280,7 @@ The Fortran 77 subroutine is ok!
 LT_AT_EXEC_CHECK([./cprogram], 0, [stdout])
 
 # A weaker output content check that is agnostic to the issues above.
-AT_CHECK([grep 'Welcome to GNU libtool mixed C/Fortran demo!' stdout],
+AT_CHECK([$GREP 'Welcome to GNU libtool mixed C/Fortran demo!' stdout],
          [0], [ignore])
 ])
 
diff --git a/tests/fail.at b/tests/fail.at
index a7c4f33..e6842b2 100644
--- a/tests/fail.at
+++ b/tests/fail.at
@@ -1,6 +1,6 @@
 # fail.at -- test that libtool really fail when it should     -*- Autotest -*-
 #
-#   Copyright (C) 2005, 2008-2009, 2011-2013 Free Software Foundation,
+#   Copyright (C) 2005, 2008-2009, 2011-2014 Free Software Foundation,
 #   Inc.
 #   Written by Ralf Wildenhues, 2005
 #
diff --git a/tests/fcdemo.at b/tests/fcdemo.at
index f8465fe..8cfa214 100644
--- a/tests/fcdemo.at
+++ b/tests/fcdemo.at
@@ -1,6 +1,6 @@
 # fcdemo.at -- Fortran 90/95 language support.		-*- Autotest -*-
 #
-#   Copyright (C) 2003, 2005-2006, 2011-2013 Free Software Foundation,
+#   Copyright (C) 2003, 2005-2006, 2011-2014 Free Software Foundation,
 #   Inc.
 #   Written by Eric Lindahl, 2002
 #   Written by Gary V. Vaughan, 2003
@@ -67,17 +67,13 @@ ACLOCAL_AMFLAGS = -I m4
 lib_LTLIBRARIES = libfoo.la libmix.la libfoo2.la libfoo3.la
 
 libfoo_la_SOURCES = foof.f90
-libfoo_la_LDFLAGS = -no-undefined
 libfoo_la_LIBADD = libfoo2.la
 
 libfoo2_la_SOURCES = foof2.f90
-libfoo2_la_LDFLAGS = -no-undefined
 
 libfoo3_la_SOURCES = foof3.f90
-libfoo3_la_LDFLAGS = -no-undefined
 
 libmix_la_SOURCES = foof.f90 foof2.f90 fooc.c
-libmix_la_LDFLAGS = -no-undefined
 
 noinst_HEADERS = foo.h
 
@@ -277,7 +273,7 @@ LT_AT_HOST_DATA([expout],
 LT_AT_EXEC_CHECK([./fprogram], 0, [stdout])
 
 # A weaker output content check that is agnostic to the issues above.
-AT_CHECK([grep 'Welcome to GNU libtool Fortran demo!' stdout],
+AT_CHECK([$GREP 'Welcome to GNU libtool Fortran demo!' stdout],
          [0], [ignore])
 
 # Similarly, we can't reliably compare actual output with the following.
@@ -298,7 +294,7 @@ The Fortran subroutine is ok!
 LT_AT_EXEC_CHECK([./cprogram], 0, [stdout])
 
 # A weaker output content check that is agnostic to the issues above.
-AT_CHECK([grep 'Welcome to GNU libtool mixed C/Fortran demo!' stdout],
+AT_CHECK([$GREP 'Welcome to GNU libtool mixed C/Fortran demo!' stdout],
          [0], [ignore])
 ])
 
diff --git a/tests/flags.at b/tests/flags.at
index 3024f2b..a2aa4ee 100644
--- a/tests/flags.at
+++ b/tests/flags.at
@@ -1,6 +1,6 @@
 # flags.at -- libtool passing of flags             -*- Autotest -*-
 #
-#   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 #
 #   This file is part of GNU Libtool.
 #
@@ -59,7 +59,7 @@ compile="$GCJ $GCJFLAGS" link="$GCJ $GCJFLAGS $LDFLAGS" source=a.java
 ])
 
 # Linker flags are not passed to the archiver, so don't test static libraries.
-if $LIBTOOL --features | grep 'enable shared libraries'; then
+if $LIBTOOL --features | $GREP 'enable shared libraries'; then
   library_and_module='library.la "module.la -module -avoid-version"'
 else
   library_and_module=
diff --git a/tests/help.at b/tests/help.at
index a8e8f8f..8dab258 100644
--- a/tests/help.at
+++ b/tests/help.at
@@ -1,6 +1,6 @@
 # help.at -- standard command line options          -*- Autotest -*-
 #
-#   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 #
 #   This file is part of GNU Libtool.
 #
@@ -29,15 +29,15 @@ AT_KEYWORDS([libtoolize])
 
 AT_CHECK([$LIBTOOLIZE --help], [], [ignore])
 AT_CHECK([$LIBTOOLIZE --version], [], [stdout])
-AT_CHECK([grep 'Copyright.*Free Software Foundation' stdout], [], [ignore])
+AT_CHECK([$GREP 'Copyright.*Free Software Foundation' stdout], [], [ignore])
 AT_CHECK([$LIBTOOL --help], [], [ignore])
 AT_CHECK([$LIBTOOL --help-all], [], [ignore])
 AT_CHECK([$LIBTOOL --version], [], [stdout])
-AT_CHECK([grep 'Copyright.*Free Software Foundation' stdout], [], [ignore])
+AT_CHECK([$GREP 'Copyright.*Free Software Foundation' stdout], [], [ignore])
 
 AT_CHECK([$LIBTOOL], [1], [stdout], [stderr])
-AT_CHECK([grep 'specify a MODE' stderr], [], [ignore])
-AT_CHECK([grep ' --help' stdout], [], [ignore])
+AT_CHECK([$GREP 'specify a MODE' stderr], [], [ignore])
+AT_CHECK([$GREP ' --help' stdout], [], [ignore])
 
 AT_CLEANUP
 
@@ -122,11 +122,11 @@ AT_CHECK([case "$LIBTOOL $CC $CPPFLAGS $CFLAGS $LDFLAGS " in ]dnl
 check_trace ()
 {
   if test X--debug = "X$trace"; then
-    AT_CHECK([grep 'enabling shell trace mode' stdout stderr], [0], [ignore])
-    AT_CHECK([grep ' --mode' stderr], [0], [ignore])
+    AT_CHECK([$GREP 'enabling shell trace mode' stdout stderr], [0], [ignore])
+    AT_CHECK([$GREP ' --mode' stderr], [0], [ignore])
   else
-    AT_CHECK([grep 'enabling shell trace mode' stdout stderr], [1])
-    AT_CHECK([grep ' --mode' stderr], [1])
+    AT_CHECK([$GREP 'enabling shell trace mode' stdout stderr], [1])
+    AT_CHECK([$GREP ' --mode' stderr], [1])
   fi
 }
 
@@ -163,12 +163,12 @@ for trace in '' --debug; do
   # it was passed at link mode.
   AT_CHECK([$orig_LIBTOOL --mode=install $lt_INSTALL liba.la libb.la $libdir],
 	   [], [stdout], [stderr])
-  if grep ': relinking ' stdout stderr; then
+  if $GREP ': relinking ' stdout stderr; then
     if test X--debug = "X$trace"; then
-      AT_CHECK([grep ' --mode=relink' stdout stderr | grep ' --debug '],
+      AT_CHECK([$GREP ' --mode=relink' stdout stderr | $GREP ' --debug '],
 	       [0], [ignore])
     else
-      AT_CHECK([grep ' --mode=relink' stdout stderr | grep ' --debug '],
+      AT_CHECK([$GREP ' --mode=relink' stdout stderr | $GREP ' --debug '],
 	       [1])
     fi
   fi
diff --git a/tests/indirect_deps.at b/tests/indirect_deps.at
index 7ca7e37..72e4783 100644
--- a/tests/indirect_deps.at
+++ b/tests/indirect_deps.at
@@ -1,6 +1,6 @@
 # indirect_deps.at -- support for link_all_deplibs=no   -*- Autotest -*-
 
-#   Copyright (C) 2007-2008, 2011-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2007-2008, 2011-2014 Free Software Foundation, Inc.
 #   Written by Ralf Wildenhues, 2007.
 #
 #   This file is part of GNU Libtool.
diff --git a/tests/infer-tag.at b/tests/infer-tag.at
index 2cbd57e..880dc6b 100644
--- a/tests/infer-tag.at
+++ b/tests/infer-tag.at
@@ -1,6 +1,6 @@
 # infer-tag.at -- libtool without --tag             -*- Autotest -*-
 #
-#   Copyright (C) 2008, 2010-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2008, 2010-2014 Free Software Foundation, Inc.
 #
 #   This file is part of GNU Libtool.
 #
diff --git a/tests/inherited_flags.at b/tests/inherited_flags.at
index ac97ec1..2bb04ff 100644
--- a/tests/inherited_flags.at
+++ b/tests/inherited_flags.at
@@ -1,6 +1,6 @@
 # inherited_flags.at -- test inherited_linker_flags          -*- Autotest -*-
 #
-#   Copyright (C) 2005-2008, 2011-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2005-2008, 2011-2014 Free Software Foundation, Inc.
 #   Written by Peter O'Garman, 2005
 #
 #   This file is part of GNU Libtool.
@@ -62,15 +62,15 @@ $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libboth.la both.lo -rpath
 
 
 mv libfoo.la libfoo.la.bak
-sed -e 's/^inherited_linker_flags.*/inherited_linker_flags=-llt_inlikely_existing_lib/g' < libfoo.la.bak > libfoo.la
+$SED -e 's/^inherited_linker_flags.*/inherited_linker_flags=-llt_inlikely_existing_lib/g' < libfoo.la.bak > libfoo.la
 rm libfoo.la.bak
 
 mv libbar.la libbar.la.bak
-sed -e 's/^inherited_linker_flags.*/inherited_linker_flags=-llt_unlikely_existing_lib/g' < libbar.la.bak > libbar.la
+$SED -e 's/^inherited_linker_flags.*/inherited_linker_flags=-llt_unlikely_existing_lib/g' < libbar.la.bak > libbar.la
 rm libbar.la.bak
 
 mv libboth.la libboth.la.bak
-sed -e "s/^inherited_linker_flags.*/inherited_linker_flags='-llt_inlikely_existing_lib -llt_unlikely_existing_lib'/g" < libboth.la.bak > libboth.la
+$SED -e "s/^inherited_linker_flags.*/inherited_linker_flags='-llt_inlikely_existing_lib -llt_unlikely_existing_lib'/g" < libboth.la.bak > libboth.la
 rm libboth.la.bak
 
 AT_CHECK([$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libbaz.la baz.lo -no-undefined -rpath /nonexistent ./libfoo.la ./libbar.la],
@@ -79,35 +79,35 @@ AT_CHECK([$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libbaz.la baz.lo
 # 'llt_[[ui]]nlikely_existing_lib.*llt_[[ui]]nlikely_existing_lib'
 # here.  This fails on win32/MSVC because the generated command lines have a
 # different syntax.  So drop the first 'l'.
-AT_CHECK([$LIBTOOL --features | grep 'disable shared libraries' && (exit 77)], [1], [ignore])
-AT_CHECK([grep 'lt_[[ui]]nlikely_existing_lib.*lt_[[ui]]nlikely_existing_lib' stdout],
+AT_CHECK([$LIBTOOL --features | $GREP 'disable shared libraries' && (exit 77)], [1], [ignore])
+AT_CHECK([$GREP 'lt_[[ui]]nlikely_existing_lib.*lt_[[ui]]nlikely_existing_lib' stdout],
 	 [0],[ignore],[ignore])
 AT_CHECK([$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o main$EXEEXT main.lo -no-undefined -rpath /nonexistent  ./libfoo.la ./libbar.la],
 	[ignore],[stdout],[ignore])
-AT_CHECK([grep 'lt_[[ui]]nlikely_existing_lib.*lt_[[ui]]nlikely_existing_lib' stdout],
+AT_CHECK([$GREP 'lt_[[ui]]nlikely_existing_lib.*lt_[[ui]]nlikely_existing_lib' stdout],
 	 [0],[ignore],[ignore])
 
 # now check for duplicates
 AT_CHECK([$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libbaz.la baz.lo -no-undefined -rpath /nonexistent ./libfoo.la ./libbar.la ./libboth.la],
 	 [ignore],[stdout],[ignore])
-AT_CHECK([grep 'lt_inlikely_existing_lib.*lt_inlikely_existing_lib' stdout],
+AT_CHECK([$GREP 'lt_inlikely_existing_lib.*lt_inlikely_existing_lib' stdout],
 	 [1],[ignore],[ignore])
-AT_CHECK([grep 'lt_unlikely_existing_lib.*lt_unlikely_existing_lib' stdout],
+AT_CHECK([$GREP 'lt_unlikely_existing_lib.*lt_unlikely_existing_lib' stdout],
 	 [1],[ignore],[ignore])
 AT_CHECK([$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o main$EXEEXT main.lo -no-undefined -rpath /nonexistent  ./libfoo.la ./libbar.la ./libboth.la],
 	[ignore],[stdout],[ignore])
-AT_CHECK([grep 'lt_inlikely_existing_lib.*lt_inlikely_existing_lib' stdout],
+AT_CHECK([$GREP 'lt_inlikely_existing_lib.*lt_inlikely_existing_lib' stdout],
 	 [1],[ignore],[ignore])
-AT_CHECK([grep 'lt_unlikely_existing_lib.*lt_unlikely_existing_lib' stdout],
+AT_CHECK([$GREP 'lt_unlikely_existing_lib.*lt_unlikely_existing_lib' stdout],
 	 [1],[ignore],[ignore])
 
 mv libboth.la libboth.la.bak
-sed "s/^inherited_linker_flags.*/inherited_linker_flags='-framework Cocoa -framework ApplicationServices'/" < libboth.la.bak > libboth.la
+$SED "s/^inherited_linker_flags.*/inherited_linker_flags='-framework Cocoa -framework ApplicationServices'/" < libboth.la.bak > libboth.la
 rm libboth.la.bak
 
 AT_CHECK([$LIBTOOL -n --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -framework Cocoa -framework ApplicationServices -o libbaz.la baz.lo libboth.la -no-undefined -rpath /nonexistent],
 	 [], [stdout], [ignore])
-AT_CHECK([grep Cocoa.ltframework stdout], [1], [], [])
-AT_CHECK([grep ' -framework Cocoa' stdout], [0], [ignore], [])
+AT_CHECK([$GREP Cocoa.ltframework stdout], [1], [], [])
+AT_CHECK([$GREP ' -framework Cocoa' stdout], [0], [ignore], [])
 
 AT_CLEANUP
diff --git a/tests/install.at b/tests/install.at
index 3d1c109..36240db 100644
--- a/tests/install.at
+++ b/tests/install.at
@@ -1,6 +1,6 @@
 # install.at -- install mode tests             -*- Autotest -*-
 #
-#   Copyright (C) 2008-2009, 2011-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2008-2009, 2011-2014 Free Software Foundation, Inc.
 #   Written by Ralf Wildenhues, 2008
 #
 #   This file is part of GNU Libtool.
@@ -28,9 +28,9 @@ AT_KEYWORDS([libtool])
 # Ensure that install_override_mode overrides the mode of the shared
 # library (and only the shared library).
 
-AT_CHECK([$LIBTOOL --features | grep 'enable shared libraries' || exit 77],
+AT_CHECK([$LIBTOOL --features | $GREP 'enable shared libraries' || exit 77],
 	 [], [ignore])
-sed 's|^\(install_override_mode\)=.*|\1=755|' < $LIBTOOL > ./libtool
+$SED 's|^\(install_override_mode\)=.*|\1=755|' < $LIBTOOL > ./libtool
 LIBTOOL=./libtool
 chmod a+rx $LIBTOOL
 
@@ -43,10 +43,10 @@ AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba.la a.lo ]dnl
 	 [-rpath $inst -no-undefined], [], [ignore], [ignore])
 AT_CHECK([$LIBTOOL --mode=install $lt_INSTALL liba.la $inst],
 	 [], [stdout], [ignore])
-AT_CHECK([grep ' -m 755' stdout], [], [ignore])
+AT_CHECK([$GREP ' -m 755' stdout], [], [ignore])
 AT_CHECK([$LIBTOOL --mode=install $lt_INSTALL -m 644 liba.la $inst],
 	 [], [stdout], [ignore])
-AT_CHECK([grep ' -m 755' stdout], [], [ignore])
-AT_CHECK([grep ' -m 644.*liba.la' stdout], [], [ignore])
+AT_CHECK([$GREP ' -m 755' stdout], [], [ignore])
+AT_CHECK([$GREP ' -m 644.*liba.la' stdout], [], [ignore])
 
 AT_CLEANUP
diff --git a/tests/lalib-syntax.at b/tests/lalib-syntax.at
index 0232b30..2ab340c 100644
--- a/tests/lalib-syntax.at
+++ b/tests/lalib-syntax.at
@@ -1,6 +1,6 @@
 # lalib-syntax.at -- parsing .la files robustly  -*- Autotest -*-
 #
-#   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 #
 #   This file is part of GNU Libtool.
 #
@@ -131,7 +131,7 @@ libdir='/somewhere'
 for file in ./missing-closing-quote.la ./wrong-quotes.la \
 	    ./no-dlname.la ./nonexistent-dlname.la; do
   LT_AT_EXEC_CHECK([./main], [1], [stdout], [ignore], [$file])
-  AT_CHECK([grep 'plugin failed to open' stdout], [], [ignore])
+  AT_CHECK([$GREP 'plugin failed to open' stdout], [], [ignore])
 done
 
 AT_CLEANUP
diff --git a/tests/libtool.at b/tests/libtool.at
index d3812bf..a466790 100755
--- a/tests/libtool.at
+++ b/tests/libtool.at
@@ -1,6 +1,6 @@
 # libtool.at -- basic libtool operation tests -*- Autotest -*-
 #
-#   Copyright (C) 2003-2005, 2008, 2011-2013 Free Software Foundation,
+#   Copyright (C) 2003-2005, 2008, 2011-2014 Free Software Foundation,
 #   Inc.
 #   Written by Gary V. Vaughan, 2003
 #
@@ -33,10 +33,10 @@ AT_BANNER([Basic libtool operation.])
 AT_SETUP([check help output])
 
 AT_CHECK([$LIBTOOL --help], [0], [stdout], [stderr])
-AT_CHECK([grep '^Usage:' stdout stderr], [0], [ignore])
+AT_CHECK([$GREP '^Usage:' stdout stderr], [0], [ignore])
 
 AT_CHECK([$LIBTOOL --mode=link --help], [0], [stdout], [stderr])
-AT_CHECK([grep '^Usage:' stdout stderr], [0], [ignore])
+AT_CHECK([$GREP '^Usage:' stdout stderr], [0], [ignore])
 
 AT_CLEANUP
 
@@ -48,7 +48,7 @@ AT_CLEANUP
 AT_SETUP([diagnose no mode specified])
 
 AT_CHECK([$LIBTOOL], [1], [ignore], [stderr])
-AT_CHECK([grep 'you must specify a MODE' stderr], [0], [ignore])
+AT_CHECK([$GREP 'you must specify a MODE' stderr], [0], [ignore])
 
 AT_CLEANUP
 
@@ -59,7 +59,7 @@ AT_CLEANUP
 
 AT_SETUP([quote shell meta-characters in filenames])
 
-eval `$LIBTOOL --config | grep '^wl='`
+eval `$LIBTOOL --config | $GREP '^wl='`
 
 # Do the torture test.
 for mode in compile link install; do
@@ -103,7 +103,7 @@ for mode in compile link install; do
   # We must not attempt to match $preargs in the output, because libtool
   # may modify them.  For example, on Cygwin, 'libtool --mode=link gcc -o
   # foo foo.o'  becomes 'gcc -o foo.exe foo.o'.
-  AT_CHECK([grep "$mode:.*$match_preflag$flag:test " stdout], [0], [ignore])
+  AT_CHECK([$GREP "$mode:.*$match_preflag$flag:test " stdout], [0], [ignore])
 
 
   # Non-trivial...
@@ -116,14 +116,14 @@ for mode in compile link install; do
 	   [0], [stdout])
   # NOTE: we use "..."'"'"..." to insert a literal quote into the expression
   #       because "...\"..." is not expanded consistently by all shells.
-  AT_CHECK([grep "$mode:.*$match_preflag"'"\?'"$flag\\\\\\\\:test\\\\\\\\"'"\? ' stdout],
+  AT_CHECK([$GREP "$mode:.*$match_preflag"'"\?'"$flag\\\\\\\\:test\\\\\\\\"'"\? ' stdout],
 	      [0], [ignore])
 
   # Shell metacharacters that should be backslashified by libtool.
   for mchar in \" \` \$; do
     AT_CHECK([$LIBTOOL -n --mode=$mode $preargs $preflag"$flag$mchar:test$mchar" $postargs],
 	     [0], [stdout])
-    AT_CHECK([grep "$mode:.*$match_preflag"'"'"\?$flag\\\\$mchar:test\\\\$mchar"'"'"\? " stdout], [0], [ignore])
+    AT_CHECK([$GREP "$mode:.*$match_preflag"'"'"\?$flag\\\\$mchar:test\\\\$mchar"'"'"\? " stdout], [0], [ignore])
   done
 
   # Shell metacharacters that should be double quoted by libtool, and need
@@ -132,7 +132,7 @@ for mode in compile link install; do
 
     AT_CHECK([$LIBTOOL -n --mode=$mode $preargs $preflag"$flag$mchar:test$mchar" $postargs],
 	     [0], [stdout])
-    AT_CHECK([grep "$mode:.*$match_preflag\"$flag\\$mchar:test\\$mchar\" " stdout], [0], [ignore])
+    AT_CHECK([$GREP "$mode:.*$match_preflag\"$flag\\$mchar:test\\$mchar\" " stdout], [0], [ignore])
   done
 
   # Metacharacters that should be double quoted by libtool, but which are
@@ -141,7 +141,7 @@ for mode in compile link install; do
 
     AT_CHECK([$LIBTOOL -n --mode=$mode $preargs $preflag"$flag$mchar:test$mchar" $postargs],
 	     [0], [stdout])
-    AT_CHECK([grep "$mode:.*$match_preflag\"$flag$mchar:test$mchar\" " stdout], [0], [ignore])
+    AT_CHECK([$GREP "$mode:.*$match_preflag\"$flag$mchar:test$mchar\" " stdout], [0], [ignore])
   done
 done
 
@@ -163,14 +163,14 @@ for ext in $extensions; do
   # Try a sample compile command.
   AT_CHECK([$LIBTOOL -n --mode=compile compiler -c foo.$ext],
            [1], [ignore], [stderr])
-  AT_CHECK([grep 'cannot' stderr], [1], [ignore])
+  AT_CHECK([$GREP 'cannot' stderr], [1], [ignore])
 done
 
 # Make sure that invalid suffixes are not recognized.
 for name in $bad_names; do
   AT_CHECK([$LIBTOOL -n --mode=compile compiler -c $name],
            [1], [ignore], [stderr])
-  AT_CHECK([grep 'cannot' stderr], [0], [ignore])
+  AT_CHECK([$GREP 'cannot' stderr], [0], [ignore])
 done
 
 AT_CLEANUP
@@ -205,7 +205,7 @@ AT_CLEANUP
 AT_SETUP([check objectlist file operation])
 
 AT_CHECK([$LIBTOOL -n --mode=link $CC -objectlist nonexistent], [1], [ignore], [stderr])
-AT_CHECK([grep 'nonexistent' stderr], [0], [ignore])
+AT_CHECK([$GREP 'nonexistent' stderr], [0], [ignore])
 
 AT_CLEANUP
 
@@ -233,12 +233,12 @@ AT_CHECK([test -n "$traced_tags"])
 for tag in $traced_tags; do
   AT_CHECK([$LIBTOOL -n --mode=link --tag=$tag compiler -o liba.la foo.lo],
            [], [ignore], [stderr])
-  AT_CHECK([grep 'ignoring unknown tag' stderr], [1], [ignore])
+  AT_CHECK([$GREP 'ignoring unknown tag' stderr], [1], [ignore])
 done
 
 # Ensure the above command would have failed for unknown tags
 AT_CHECK([$LIBTOOL -n --mode=link --tag=UnKnOwN compiler -o liba.la foo.lo],
          [], [ignore], [stderr])
-AT_CHECK([grep 'ignoring unknown tag' stderr], [0], [ignore])
+AT_CHECK([$GREP 'ignoring unknown tag' stderr], [0], [ignore])
 
 AT_CLEANUP
diff --git a/tests/libtoolize.at b/tests/libtoolize.at
index d9bab70..566a2f4 100644
--- a/tests/libtoolize.at
+++ b/tests/libtoolize.at
@@ -1,6 +1,6 @@
 # libtoolize.at -- test libtoolize operation                  -*- Autotest -*-
 #
-#   Copyright (C) 2005, 2007-2008, 2011-2013 Free Software Foundation,
+#   Copyright (C) 2005, 2007-2008, 2011-2014 Free Software Foundation,
 #   Inc.
 #   Written by Gary V. Vaughan, 2005
 #
@@ -790,9 +790,6 @@ LT_AT_ACLOCAL([-I $abs_top_srcdir/m4])
 
 ## The following code is adapted (and simplified) from libtoolize.in
 ####
-: ${GREP="grep"}
-: ${SED="sed"}
-
 basename='s|^.*/||'
 
 # func_grep expression filename
@@ -1163,7 +1160,7 @@ AT_DATA([libltdl/acinclude.m4],
 LT_AT_CHECK_LIBTOOLIZE([--copy --force --ltdl], 0, [ignore])
 
 # check files are left as expected
-AT_CHECK([grep 'keep me' acinclude.m4], 0, [ignore])
+AT_CHECK([$GREP 'keep me' acinclude.m4], 0, [ignore])
 AT_CHECK([test -f libltdl/acinclude.m4], 1, [ignore], [ignore])
 
 AT_CLEANUP
diff --git a/tests/link-order.at b/tests/link-order.at
index 7163836..62f8b73 100644
--- a/tests/link-order.at
+++ b/tests/link-order.at
@@ -1,6 +1,6 @@
 # link-order.at -- ensure that library linking order matches  -*- Autotest -*-
 #
-#   Copyright (C) 2005, 2007-2008, 2011-2013 Free Software Foundation,
+#   Copyright (C) 2005, 2007-2008, 2011-2014 Free Software Foundation,
 #   Inc.
 #   Written by Alexandre Oliva & Ralf Wildenhues, 2005
 #
diff --git a/tests/link-order2.at b/tests/link-order2.at
index cf6a77f..a35f758 100644
--- a/tests/link-order2.at
+++ b/tests/link-order2.at
@@ -1,6 +1,6 @@
 # link-order2.at -- test link order of deplibs                -*- Autotest -*-
 #
-#   Copyright (C) 2006-2008, 2011-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2006-2008, 2011-2014 Free Software Foundation, Inc.
 #   Written by Ralf Wildenhues, 2006
 #
 #   This file is part of GNU Libtool.
diff --git a/tests/loadlibrary.at b/tests/loadlibrary.at
index b0994eb..7e55b1f 100644
--- a/tests/loadlibrary.at
+++ b/tests/loadlibrary.at
@@ -1,6 +1,6 @@
 # loadlibrary.at -- test loadlibrary functionality          -*- Autotest -*-
 #
-#   Copyright (C) 2010-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2010-2014 Free Software Foundation, Inc.
 #   This file is part of GNU Libtool.
 #
 # GNU Libtool is free software; you can redistribute it and/or
diff --git a/tests/localization.at b/tests/localization.at
index 0cb2cfd..c9ea8d2 100644
--- a/tests/localization.at
+++ b/tests/localization.at
@@ -1,6 +1,6 @@
 # localization.at -- libtool and locales                -*- Autotest -*-
 #
-#   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 #
 #   This file is part of GNU Libtool.
 #
@@ -57,7 +57,7 @@ LT_AT_NORMALIZE_COMPILER_OUTPUT([stderr], [libtool-stderr])
 #   selections and the available locales.
 #
 #   Continuing processing using the "C" locale.
-AT_CHECK([grep locale stdout stderr && exit 77], [1])
+AT_CHECK([$GREP locale stdout stderr && exit 77], [1])
 AT_CHECK([diff expected-stderr libtool-stderr])
 AT_CHECK([diff expected-stdout libtool-stdout])
 
@@ -66,7 +66,7 @@ m4_define([lt_localize],
 [[LANGUAGE='a; nosuchprogram " '\''  & $x /#+*(){}|,:`\ !%']])
 AT_CHECK([(lt_localize $LIBTOOL --mode=compile --tag=CC $CC $CPPFLAGS $CFLAGS -c b.c)],
 	 [0], [stdout], [stderr])
-AT_CHECK([grep nosuchprogram stdout stderr], [1])
+AT_CHECK([$GREP nosuchprogram stdout stderr], [1])
 
 m4_popdef([lt_localize])
 
diff --git a/tests/lt_dladvise.at b/tests/lt_dladvise.at
index ccb563c..5eeef1e 100644
--- a/tests/lt_dladvise.at
+++ b/tests/lt_dladvise.at
@@ -1,6 +1,6 @@
 # lt_dladvise.at -- test libltdl functionality                -*- Autotest -*-
 #
-#   Copyright (C) 2007-2009, 2011-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2007-2009, 2011-2014 Free Software Foundation, Inc.
 #   Written by Gary V. Vaughan, 2007
 #
 #   This file is part of GNU Libtool.
@@ -329,7 +329,7 @@ dlpreloadable='preload'
 # ------------------------------------------------------------------------- #
 
 have_shared=false
-$LIBTOOL --features | grep 'enable shared libraries' >/dev/null && have_shared=:
+$LIBTOOL --features | $GREP 'enable shared libraries' >/dev/null && have_shared=:
 
 case $host_os,$have_shared in
 cygwin* | mingw* | cegcc* | *,false)
diff --git a/tests/lt_dlexit.at b/tests/lt_dlexit.at
index cef7ee6..8680634 100644
--- a/tests/lt_dlexit.at
+++ b/tests/lt_dlexit.at
@@ -1,6 +1,6 @@
 # lt_dlexit.at -- test libltdl functionality                  -*- Autotest -*-
 #
-#   Copyright (C) 2007-2008, 2010-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2007-2008, 2010-2014 Free Software Foundation, Inc.
 #   Written by Dave Brolley & Ralf Wildenhues, 2007
 #
 #   This file is part of GNU Libtool.
diff --git a/tests/lt_dlopen.at b/tests/lt_dlopen.at
index b837175..5c9d1ef 100644
--- a/tests/lt_dlopen.at
+++ b/tests/lt_dlopen.at
@@ -1,6 +1,6 @@
 # lt_dlopen.at -- test libltdl functionality                -*- Autotest -*-
 #
-#   Copyright (C) 2009, 2011-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2009, 2011-2014 Free Software Foundation, Inc.
 #   This file is part of GNU Libtool.
 #
 # GNU Libtool is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@ AT_KEYWORDS([libltdl])
 AT_XFAIL_IF([:])
 
 # This test only works if the system allows undefined symbols.
-eval `$LIBTOOL --config | grep '^allow_undefined_flag='`
+eval `$LIBTOOL --config | $GREP '^allow_undefined_flag='`
 AT_CHECK([test unsupported != "$allow_undefined_flag" || exit 77])
 
 AT_DATA([main.c],
@@ -98,6 +98,6 @@ AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main$EXEEXT main.$OBJEXT
 
 LT_AT_EXEC_CHECK([./main], [], [ignore], [ignore], [./good-plugin.la])
 LT_AT_EXEC_CHECK([./main], [1], [ignore], [stderr], [./missing-symbol-plugin.la])
-AT_CHECK([grep 'missing symbol' stderr], [], [ignore])
+AT_CHECK([$GREP 'missing symbol' stderr], [], [ignore])
 
 AT_CLEANUP
diff --git a/tests/lt_dlopen_a.at b/tests/lt_dlopen_a.at
index 34a0d9b..50fa081 100644
--- a/tests/lt_dlopen_a.at
+++ b/tests/lt_dlopen_a.at
@@ -1,6 +1,6 @@
 # lt_dlopen_a.at -- test libltdl functionality                -*- Autotest -*-
 #
-#   Copyright (C) 2009, 2011-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2009, 2011-2014 Free Software Foundation, Inc.
 #   This file is part of GNU Libtool.
 #
 # GNU Libtool is free software; you can redistribute it and/or
diff --git a/tests/lt_dlopenext.at b/tests/lt_dlopenext.at
index 78edd47..0a4ca5d 100644
--- a/tests/lt_dlopenext.at
+++ b/tests/lt_dlopenext.at
@@ -1,6 +1,6 @@
 # lt_dlopenext.at -- test libltdl functionality             -*- Autotest -*-
 #
-#   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 #   This file is part of GNU Libtool.
 #
 # GNU Libtool is free software; you can redistribute it and/or
@@ -24,7 +24,7 @@ AT_SETUP([lt_dlopenext error messages])
 AT_KEYWORDS([libltdl])
 
 # This test requires shared library support.
-AT_CHECK([$LIBTOOL --features | grep 'enable shared libraries' || exit 77],
+AT_CHECK([$LIBTOOL --features | $GREP 'enable shared libraries' || exit 77],
 	 [], [ignore])
 
 prefix=`pwd`/inst
@@ -234,7 +234,7 @@ for lafile in $have_lafile; do
   for dir in inst/lib "$libdir"; do
     LT_AT_EXEC_CHECK([./ltdl-loader], [], [stdout], [ignore],
 		     [$dir/simple-module World])
-    AT_CHECK([grep "Hello, World" stdout], [], [ignore])
+    AT_CHECK([$GREP "Hello, World" stdout], [], [ignore])
 
     for var in MODULE_PATH LTDL_LIBRARY_PATH $shlibpath_var
     do
@@ -242,7 +242,7 @@ for lafile in $have_lafile; do
       export $var
       LT_AT_EXEC_CHECK([./ltdl-loader], [], [stdout], [ignore],
 		       [simple-module World])
-      AT_CHECK([grep "Hello, World" stdout], [], [ignore])
+      AT_CHECK([$GREP "Hello, World" stdout], [], [ignore])
       $unset $var || eval $var=
     done
   done
diff --git a/tests/ltdl-api.at b/tests/ltdl-api.at
index 0215484..4306467 100644
--- a/tests/ltdl-api.at
+++ b/tests/ltdl-api.at
@@ -1,6 +1,6 @@
 # ltdl-api.at -- test libltdl API                -*- Autotest -*-
 #
-#   Copyright (C) 2008, 2011-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2008, 2011-2014 Free Software Foundation, Inc.
 #   Written by Ralf Wildenhues, 2008.
 #
 #   This file is part of GNU Libtool.
@@ -32,8 +32,8 @@ AT_CHECK([test -f "$argz_o" || exit 77])
 AT_CHECK([eval "$NM \"\$argz_o\" | $global_symbol_pipe"],
 	 [], [stdout], [ignore])
 # Check for global symbols beginning with "argz_"
-AT_CHECK([grep "^T argz_" stdout], [1])
+AT_CHECK([$GREP "^T argz_" stdout], [1])
 # and also for the _ prefixed version "_argz_"
-AT_CHECK([grep "^T _argz_" stdout], [1])
+AT_CHECK([$GREP "^T _argz_" stdout], [1])
 
 AT_CLEANUP
diff --git a/tests/ltdl-libdir.at b/tests/ltdl-libdir.at
index ea3334a..93cdbf4 100644
--- a/tests/ltdl-libdir.at
+++ b/tests/ltdl-libdir.at
@@ -1,6 +1,6 @@
 # ltdl-libdir.at -- test libltdl functionality             -*- Autotest -*-
 #
-#   Copyright (C) 2010-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2010-2014 Free Software Foundation, Inc.
 #   This file is part of GNU Libtool.
 #
 # GNU Libtool is free software; you can redistribute it and/or
@@ -24,7 +24,7 @@ AT_SETUP([libdir of installed modules])
 AT_KEYWORDS([libltdl])
 
 # This test requires shared library support.
-AT_CHECK([$LIBTOOL --features | grep 'enable shared libraries' || exit 77],
+AT_CHECK([$LIBTOOL --features | $GREP 'enable shared libraries' || exit 77],
 	 [], [ignore])
 
 # With MinGW, try Windows-style paths only.
diff --git a/tests/mdemo.at b/tests/mdemo.at
index f182097..1e196ed 100644
--- a/tests/mdemo.at
+++ b/tests/mdemo.at
@@ -1,6 +1,6 @@
 # demo.at -- Dynamic ltdl runtime loading -*- Autotest -*-
 #
-#   Copyright (C) 1998, 2002-2004, 2011-2013 Free Software Foundation,
+#   Copyright (C) 1998, 2002-2004, 2011-2014 Free Software Foundation,
 #   Inc.
 #   Written by Thomas Tanner, 1998
 #   Written by Greg Eisenhauer, 2002
@@ -601,13 +601,13 @@ prefixdir=`pwd`/_inst
 m4_define([_LT_CHECK_EXECUTE],
 [LT_AT_MAKE
 LT_AT_EXEC_CHECK([./mdemo_static], 0, [ignore], [],
-    [./foo1.la ./libfoo2.la | grep '^try_iterate: '])
+    [./foo1.la ./libfoo2.la | $GREP '^try_iterate: '])
 LT_AT_EXEC_CHECK([./mdemo], 0, [ignore], [],
-    [./foo1.la ./libfoo2.la | grep '^try_iterate: '])
+    [./foo1.la ./libfoo2.la | $GREP '^try_iterate: '])
 LT_AT_EXEC_CHECK([./mdemo_static], 0, [ignore], [],
-    [`pwd`/foo1.la `pwd`/libfoo2.la | grep '^try_iterate: '])
+    [`pwd`/foo1.la `pwd`/libfoo2.la | $GREP '^try_iterate: '])
 LT_AT_EXEC_CHECK([./mdemo], 0, [ignore], [],
-    [`pwd`/foo1.la `pwd`/libfoo2.la | grep '^try_iterate: '])
+    [`pwd`/foo1.la `pwd`/libfoo2.la | $GREP '^try_iterate: '])
 ])
 
 # _LT_CHECK_INSTALL
@@ -620,9 +620,9 @@ m4_define([_LT_CHECK_INSTALL],
 PATH=$prefixdir/lib:$PATH
 
 LT_AT_EXEC_CHECK([$prefixdir/bin/mdemo_static], 0, [ignore], [],
-    [$prefixdir/lib/foo1.la $prefixdir/lib/libfoo2.la | grep '^try_iterate: '])
+    [$prefixdir/lib/foo1.la $prefixdir/lib/libfoo2.la | $GREP '^try_iterate: '])
 LT_AT_EXEC_CHECK([$prefixdir/bin/mdemo], 0, [ignore], [],
-    [$prefixdir/lib/foo1.la $prefixdir/lib/libfoo2.la | grep '^try_iterate: '])
+    [$prefixdir/lib/foo1.la $prefixdir/lib/libfoo2.la | $GREP '^try_iterate: '])
 ])
 
 
@@ -697,7 +697,7 @@ after=$objdir/temp/temp/after
 
 # Create a new libtool script that will enter dry run if the environment
 # variable force_dry_run is set
-sed 's|^[[	 ]]*opt_dry_run=.*$|opt_dry_run=$force_dry_run|' libtool > ltnew && mv ltnew libtool
+$SED 's|^[[	 ]]*opt_dry_run=.*$|opt_dry_run=$force_dry_run|' libtool > ltnew && mv ltnew libtool
 export force_dry_run
 
 # main.o is not compiled with libtool, but it depends on it, so make
diff --git a/tests/need_lib_prefix.at b/tests/need_lib_prefix.at
index 2102d6d..4b8bca1 100644
--- a/tests/need_lib_prefix.at
+++ b/tests/need_lib_prefix.at
@@ -1,6 +1,6 @@
 # need-lib-prefix.at -- test libltdl functionality            -*- Autotest -*-
 #
-#   Copyright (C) 2007-2008, 2010-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2007-2008, 2010-2014 Free Software Foundation, Inc.
 #   Written by Gary V. Vaughan, 2007
 #
 #   This file is part of GNU Libtool.
@@ -161,7 +161,7 @@ eval libname=\"$libname_spec\"
 AT_CHECK([test lib = "$libname" || exit 77])
 
 # Create our own libtool, forcing need_lib_prefix setting
-sed 's|^\(need_lib_prefix\)=.*$|\1=unknown|' $LIBTOOL > ./libtool
+$SED 's|^\(need_lib_prefix\)=.*$|\1=unknown|' $LIBTOOL > ./libtool
 LIBTOOL="$SHELL ./libtool"
 
 # Installation directory:
diff --git a/tests/no-executables.at b/tests/no-executables.at
index 8b5ddf0..b3bee17 100644
--- a/tests/no-executables.at
+++ b/tests/no-executables.at
@@ -1,6 +1,6 @@
 # no-executables.at -- Libtool usage in GCC        -*- Autotest -*-
 
-#   Copyright (C) 2008, 2010-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2008, 2010-2014 Free Software Foundation, Inc.
 #
 #   This file is part of GNU Libtool.
 #
diff --git a/tests/nocase.at b/tests/nocase.at
index 958f2ca..29958ec 100644
--- a/tests/nocase.at
+++ b/tests/nocase.at
@@ -1,6 +1,6 @@
 # nocase.at --  test for nocase lib search  -*- Autotest -*-
 #
-#   Copyright (C) 2010-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2010-2014 Free Software Foundation, Inc.
 #   Written by Peter Rosin, 2007
 #
 #   This file is part of GNU Libtool.
diff --git a/tests/nonrecursive.at b/tests/nonrecursive.at
index c06184d..0d1006d 100644
--- a/tests/nonrecursive.at
+++ b/tests/nonrecursive.at
@@ -1,6 +1,6 @@
 # nonrecursive.at -- test nonrecursive Automake Libltdl       -*- Autotest -*-
 #
-#   Copyright (C) 2005, 2008-2009, 2011-2013 Free Software Foundation,
+#   Copyright (C) 2005, 2008-2009, 2011-2014 Free Software Foundation,
 #   Inc.
 #   Written by Gary V. Vaughan, 2005
 #
diff --git a/tests/old-ltdl-iface.at b/tests/old-ltdl-iface.at
index 58ca09f..a809622 100644
--- a/tests/old-ltdl-iface.at
+++ b/tests/old-ltdl-iface.at
@@ -1,6 +1,6 @@
 # old-ltdl-iface.at -- exercise old libtoolize interface to libltdl
 #
-#   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 #   Written by Gary V. Vaughan, 2011
 #
 #   This file is part of GNU Libtool.
diff --git a/tests/old-m4-iface.at b/tests/old-m4-iface.at
index eab1192..c58832b 100644
--- a/tests/old-m4-iface.at
+++ b/tests/old-m4-iface.at
@@ -1,6 +1,6 @@
 # old-m4-iface.at -- exercise old m4 interface to libtool     -*- Autotest -*-
 #
-#   Copyright (C) 2005, 2008-2009, 2011-2013 Free Software Foundation,
+#   Copyright (C) 2005, 2008-2009, 2011-2014 Free Software Foundation,
 #   Inc.
 #   Written by Gary V. Vaughan, 2005
 #
@@ -94,14 +94,14 @@ LT_AT_EXEC_CHECK([./old], 0, [Hello, World!])
 
 # Now, test that libtoolize doesn't mistakenly think the user called
 # any libtool macros if in fact she didn't.
-sed '/AM_PROG_LIBTOOL/d' configure.in >configure.int
+$SED '/AM_PROG_LIBTOOL/d' configure.in >configure.int
 mv -f configure.int configure.in
 AT_CHECK([$LIBTOOLIZE -n], [0], [stdout], [stderr])
 # ensure no shell errors:
-AT_CHECK([grep -v "^libtoolize: " stderr], [1])
-AT_CHECK([grep "Remember to add.*LT_INIT.*to configure.in" stdout], [0], [ignore])
-AT_CHECK([grep "Consider adding.*LT_WITH_LTDL" stdout], [1])
-AT_CHECK([grep "Remember to add.*LT_CONFIG_LTDL_DIR" stdout], [1])
+AT_CHECK([$GREP -v "^libtoolize: " stderr], [1])
+AT_CHECK([$GREP "Remember to add.*LT_INIT.*to configure.in" stdout], [0], [ignore])
+AT_CHECK([$GREP "Consider adding.*LT_WITH_LTDL" stdout], [1])
+AT_CHECK([$GREP "Remember to add.*LT_CONFIG_LTDL_DIR" stdout], [1])
 
 AT_CLEANUP
 
diff --git a/tests/pic_flag.at b/tests/pic_flag.at
index d8fb117..13fddf0 100644
--- a/tests/pic_flag.at
+++ b/tests/pic_flag.at
@@ -1,6 +1,6 @@
 # pic_flag.at -- override the pic_flag at configure time   -*- Autotest -*-
 
-#   Copyright (C) 2010-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2010-2014 Free Software Foundation, Inc.
 #
 #   This file is part of GNU Libtool.
 #
@@ -36,8 +36,8 @@ C_pic_flag='-fpic -DPIC'
 AT_CHECK([$CC $CPPFLAGS $CFLAGS $C_pic_flag -c foo.c || exit 77],
 	 [], [stdout], [stderr])
 # The configure test for the PIC flag also checks for warnings.
-AT_CHECK([grep fpic stdout stderr && exit 77], [1])
-AT_CHECK([[grep '[uU]nknown.*option' stdout stderr && exit 77]], [1])
+AT_CHECK([$GREP fpic stdout stderr && exit 77], [1])
+AT_CHECK([[$GREP '[uU]nknown.*option' stdout stderr && exit 77]], [1])
 
 CXX_pic_flag='-fpic -DPIC'
 if $CXX $CPPFLAGS $CXXFLAGS $CXX_pic_flag -c foo.cpp; then :; else
@@ -57,7 +57,7 @@ LT_AT_CONFIGURE([lt_cv_prog_compiler_pic="$C_pic_flag" ]dnl
 		[./configure])
 : ${MAKE=make}
 AT_CHECK([$MAKE], [], [stdout], [ignore])
-AT_CHECK([if ./libtool --features | grep 'enable shared libraries'; then ]dnl
-	 [  grep ' -fpic' stdout; else exit 77; fi], [], [ignore], [ignore])
+AT_CHECK([if ./libtool --features | $GREP 'enable shared libraries'; then ]dnl
+	 [  $GREP ' -fpic' stdout; else exit 77; fi], [], [ignore], [ignore])
 
 AT_CLEANUP
diff --git a/tests/recursive.at b/tests/recursive.at
index 9239843..ca08cd3 100644
--- a/tests/recursive.at
+++ b/tests/recursive.at
@@ -1,6 +1,6 @@
 # recursive.at -- test recursive Automake libltdl build       -*- Autotest -*-
 #
-#   Copyright (C) 2005, 2008, 2011-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2005, 2008, 2011-2014 Free Software Foundation, Inc.
 #   Written by Gary V. Vaughan, 2005
 #
 #   This file is part of GNU Libtool.
diff --git a/tests/resident.at b/tests/resident.at
index 4a8d0d3..48bc261 100644
--- a/tests/resident.at
+++ b/tests/resident.at
@@ -1,6 +1,6 @@
 # resident.at -- test resident modules              -*- Autotest -*-
 
-#   Copyright (C) 2010-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2010-2014 Free Software Foundation, Inc.
 #
 #   This file is part of GNU Libtool.
 #
@@ -143,6 +143,6 @@ AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main$EXEEXT main.$OBJEXT
 	 [-dlopen plugin.la $LIBLTDL],
 	 [], [ignore], [ignore])
 LT_AT_EXEC_CHECK([./main], [], [stdout], [ignore], [./plugin.la])
-AT_CHECK([grep 'called from atexit handler' stdout], [], [ignore])
+AT_CHECK([$GREP 'called from atexit handler' stdout], [], [ignore])
 
 AT_CLEANUP
diff --git a/tests/runpath-in-lalib.at b/tests/runpath-in-lalib.at
index 2b6b522..6ea977e 100644
--- a/tests/runpath-in-lalib.at
+++ b/tests/runpath-in-lalib.at
@@ -1,6 +1,6 @@
 # runpath-in-lalib.at --                         -*- Autotest -*-
 
-#   Copyright (C) 2007-2008, 2011-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2007-2008, 2011-2014 Free Software Foundation, Inc.
 #   Written by Ralf Wildenhues, 2007
 #
 #   This file is part of GNU Libtool.
@@ -58,8 +58,8 @@ AT_CHECK([$LIBTOOL --mode=install cp liba.la $libdir/liba.la], [], [ignore], [ig
 AT_CHECK([$LIBTOOL --mode=install cp libb.la $libdir/libb.la], [], [ignore], [ignore])
 AT_CHECK([$LIBTOOL --mode=install cp m$EXEEXT $bindir/m$EXEEXT], [], [ignore], [ignore])
 
-AT_CHECK([grep /foobar $libdir/liba.la], [], [ignore])
-AT_CHECK([grep /foobar $libdir/libb.la], [], [ignore])
+AT_CHECK([$GREP /foobar $libdir/liba.la], [], [ignore])
+AT_CHECK([$GREP /foobar $libdir/libb.la], [], [ignore])
 
 # TODO: check that m gets -R, too.
 
diff --git a/tests/search-path.at b/tests/search-path.at
index c3eb720..992e42a 100644
--- a/tests/search-path.at
+++ b/tests/search-path.at
@@ -1,6 +1,6 @@
 # search-path.at -- test sys_lib_search_path_spec             -*- Autotest -*-
 #
-#   Copyright (C) 2006, 2008, 2010-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2006, 2008, 2010-2014 Free Software Foundation, Inc.
 #
 #   This file is part of GNU Libtool.
 #
@@ -77,7 +77,7 @@ HCURSOR get_cursor (void)
 }
 ]])
 
-eval "`$LIBTOOL --config | grep '^build_libtool_libs='`"
+eval "`$LIBTOOL --config | $GREP '^build_libtool_libs='`"
 AT_CHECK([test yes = "$build_libtool_libs" || exit 77])
 
 AT_CHECK([$LIBTOOL --mode=compile --tag=CC \
@@ -92,6 +92,6 @@ AT_CHECK([$LIBTOOL --mode=link --tag=CC --tag=disable-static \
 
 # If -luser32 was found, then libtool will build a shared library,
 # otherwise libtool will fall back to creating a static library.
-AT_CHECK([grep old_library=\'\' libgc.la], [], [ignore])
+AT_CHECK([$GREP old_library=\'\' libgc.la], [], [ignore])
 
 AT_CLEANUP
diff --git a/tests/shlibpath.at b/tests/shlibpath.at
index eb3816f..7872673 100644
--- a/tests/shlibpath.at
+++ b/tests/shlibpath.at
@@ -1,6 +1,6 @@
 # shlibpath.at -- Test shlibpath settings                     -*- Autotest -*-
 #
-#   Copyright (C) 2006, 2008, 2011-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2006, 2008, 2011-2014 Free Software Foundation, Inc.
 #   Written by Ralf Wildenhues, 2006
 #
 #   This file is part of GNU Libtool.
diff --git a/tests/slist.at b/tests/slist.at
index b452ca0..7ea8bd8 100644
--- a/tests/slist.at
+++ b/tests/slist.at
@@ -1,6 +1,6 @@
 # slist.at -- test slist.c                   -*- Autotest -*-
 #
-#   Copyright (C) 2009, 2011-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2009, 2011-2014 Free Software Foundation, Inc.
 #
 #   This file is part of GNU Libtool.
 #
diff --git a/tests/standalone.at b/tests/standalone.at
index 00a6df2..de3d9b0 100644
--- a/tests/standalone.at
+++ b/tests/standalone.at
@@ -1,6 +1,6 @@
 # standalone.at -- test standalone libltdl builds             -*- Autotest -*-
 #
-#   Copyright (C) 2005, 2008, 2011-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2005, 2008, 2011-2014 Free Software Foundation, Inc.
 #   Written by Gary V. Vaughan, 2006
 #
 #   This file is part of GNU Libtool.
diff --git a/tests/static.at b/tests/static.at
index 42eedd5..19125de 100644
--- a/tests/static.at
+++ b/tests/static.at
@@ -1,6 +1,6 @@
 # static.at -- test flags for static/dynamic linking          -*- Autotest -*-
 #
-#   Copyright (C) 2006-2008, 2011-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2006-2008, 2011-2014 Free Software Foundation, Inc.
 #   Written by Ralf Wildenhues, 2006
 #
 #   This file is part of GNU Libtool.
@@ -86,8 +86,8 @@ bindir_broken=$prefix_broken/bin
 have_static=false
 have_shared=false
 per_deplib=false
-$LIBTOOL --features | grep 'enable static libraries' >/dev/null && have_static=:
-$LIBTOOL --features | grep 'enable shared libraries' >/dev/null && have_shared=:
+$LIBTOOL --features | $GREP 'enable static libraries' >/dev/null && have_static=:
+$LIBTOOL --features | $GREP 'enable shared libraries' >/dev/null && have_shared=:
 eval `$LIBTOOL --config |
         $EGREP '^(per_deplib_(static|dynamic)_flag|shlibpath_var|link_static_flag)='`
 if test -n "$per_deplib_static_flag" && test -n "$per_deplib_dynamic_flag"; then
diff --git a/tests/stresstest.at b/tests/stresstest.at
index abb602e..ffcffec 100644
--- a/tests/stresstest.at
+++ b/tests/stresstest.at
@@ -1,6 +1,6 @@
 # stresstest.at -- Libtool stress test                       -*- Autotest -*-
 #
-#   Copyright (C) 2005-2008, 2011-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2005-2008, 2011-2014 Free Software Foundation, Inc.
 #   Written by Ralf Wildenhues, 2005
 #
 #   This file is part of GNU Libtool.
diff --git a/tests/subproject.at b/tests/subproject.at
index 446321c..106f3d1 100644
--- a/tests/subproject.at
+++ b/tests/subproject.at
@@ -1,6 +1,6 @@
 # subproject.at -- test subproject Libltdl builds             -*- Autotest -*-
 #
-#   Copyright (C) 2005, 2008, 2011-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2005, 2008, 2011-2014 Free Software Foundation, Inc.
 #   Written by Gary V. Vaughan, 2005
 #
 #   This file is part of GNU Libtool.
diff --git a/tests/sysroot.at b/tests/sysroot.at
index 08d2f42..777c8a0 100644
--- a/tests/sysroot.at
+++ b/tests/sysroot.at
@@ -1,6 +1,6 @@
 # static.at -- test flags for sysrooting          -*- Autotest -*-
 #
-#   Copyright (C) 2009, 2011-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2009, 2011-2014 Free Software Foundation, Inc.
 #   Written by Paolo Bonzini, 2009
 #
 #   This file is part of GNU Libtool.
@@ -39,7 +39,7 @@ for i in crt0.o crt1.o crt2.o crti.o; do
   test $? = 0 || continue
   case $j in
     $gcc_sysroot*/lib/$i)
-      prefix=`echo "$j" | sed "s|^$gcc_sysroot\\(.*\\)/lib/$i\$|\\1|"`
+      prefix=`echo "$j" | $SED "s|^$gcc_sysroot\\(.*\\)/lib/$i\$|\\1|"`
       break ;;
   esac
 done
@@ -104,7 +104,7 @@ LT_AT_BOOTSTRAP([], [-I $abs_top_srcdir/libltdl/m4], [ignore],
 
 AT_CHECK([$MAKE install DESTDIR=$sysroot], [0], [ignore], [ignore])
 AT_CHECK([test -f "$sysroot/$prefix/lib/lib1.la"])
-AT_CHECK([grep -F "$sysroot" "$sysroot/$prefix/lib/lib1.la"], [1])
+AT_CHECK([$GREP -F "$sysroot" "$sysroot/$prefix/lib/lib1.la"], [1])
 cd ..
 
 # Build and install package 2.
@@ -145,7 +145,7 @@ LT_AT_BOOTSTRAP([], [-I $abs_top_srcdir/libltdl/m4], [ignore],
 
 AT_CHECK([$MAKE install DESTDIR=$sysroot], [0], [ignore], [ignore])
 AT_CHECK([test -f "$sysroot/$prefix/lib/lib2.la"])
-AT_CHECK([grep -F "$sysroot" "$sysroot/$prefix/lib/lib2.la"], [1])
+AT_CHECK([$GREP -F "$sysroot" "$sysroot/$prefix/lib/lib2.la"], [1])
 cd ..
 
 # Build and install a program.
@@ -185,10 +185,10 @@ LT_AT_BOOTSTRAP([], [-I $abs_top_srcdir/libltdl/m4], [ignore],
 
 AT_CHECK([$MAKE install DESTDIR=$sysroot], [0], [ignore], [ignore])
 AT_CHECK([test -f "$sysroot/$prefix/bin/prog$EXEEXT"])
-AT_CHECK([grep -F "$sysroot" "$sysroot/$prefix/bin/prog$EXEEXT"], [1])
-AT_CHECK([grep "'.*=" $sysroot/$prefix/lib/lib2.la], [0], [ignore])
+AT_CHECK([$GREP -F "$sysroot" "$sysroot/$prefix/bin/prog$EXEEXT"], [1])
+AT_CHECK([$GREP "'.*=" $sysroot/$prefix/lib/lib2.la], [0], [ignore])
 AT_CHECK([./libtool --mode=finish $sysroot/$prefix/lib/lib@<:@12@:>@.la], [0], [ignore])
-AT_CHECK([grep "'.*=" $sysroot/$prefix/lib/lib@<:@12@:>@.la], [1])
+AT_CHECK([$GREP "'.*=" $sysroot/$prefix/lib/lib@<:@12@:>@.la], [1])
 
 # missing tests
 # 1) pass absolute .la files
diff --git a/tests/tagdemo.at b/tests/tagdemo.at
index d7f94be..ad2172b 100644
--- a/tests/tagdemo.at
+++ b/tests/tagdemo.at
@@ -1,6 +1,6 @@
 # tagdemo.at -- C++ Language support.			 -*- Autotest -*-
 #
-#   Copyright (C) 2003-2005, 2011-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2003-2005, 2011-2014 Free Software Foundation, Inc.
 #   Written by Gary V. Vaughan, 2003
 #
 #   This file is part of GNU Libtool.
@@ -388,7 +388,7 @@ LT_AT_BOOTSTRAP([], [-I m4], [], [--add-missing], [],
                 [--disable-static], [ignore])
 AT_CHECK([$GREP "^allow_undefined_flag=.\{0,1\}unsupported.\{0,1\}$" libtool && (exit 77)],
           1, [ignore])
-sed 's|allow_undefined=no|allow_undefined=yes|g' libtool > ltnew && mv -f ltnew libtool
+$SED 's|allow_undefined=no|allow_undefined=yes|g' libtool > ltnew && mv -f ltnew libtool
 LT_AT_CHECK_EXECUTE([], [./tagdemo])
 
 
diff --git a/tests/template.at b/tests/template.at
index 6ffd0bd..a5bfcef 100644
--- a/tests/template.at
+++ b/tests/template.at
@@ -1,6 +1,6 @@
 # template.at -- test C++ templates with libtool              -*- Autotest -*-
 #
-#   Copyright (C) 2005, 2007-2008, 2011-2013 Free Software Foundation,
+#   Copyright (C) 2005, 2007-2008, 2011-2014 Free Software Foundation,
 #   Inc.
 #   Written by Markus Christen, 2005
 #
@@ -214,7 +214,7 @@ cd obj
 
 # If the compiler supports -c -o, we want to use it:
 # it may make a difference for templates
-eval `$LIBTOOL --tag=CXX --config | grep ^compiler_c_o=`
+eval `$LIBTOOL --tag=CXX --config | $GREP ^compiler_c_o=`
 case $compiler_c_o in
 yes)
   main_o=sub/main.$OBJEXT
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 99122be..393be12 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -1,6 +1,6 @@
 # Process with autom4te to create an -*- Autotest -*- test suite.
 #
-#   Copyright (C) 2004-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2004-2014 Free Software Foundation, Inc.
 #   Written by Gary V. Vaughan, 2004
 #
 #   This file is part of GNU Libtool.
@@ -35,8 +35,7 @@ for tool in ACLOCAL AUTOHEADER AUTOCONF AUTOMAKE AUTORECONF; do
   if eval \$$tool --version >/dev/null 2>&1; then :; else eval $tool=no; fi
 done
 export ACLOCAL AUTOHEADER AUTOCONF AUTOMAKE AUTORECONF
-eval `$LIBTOOL --config | grep '^EGREP='`
-eval `$LIBTOOL --config | $EGREP '^(FGREP|objdir|objext)'`
+eval `$LIBTOOL --config | $EGREP '^(objdir|objext)'`
 eval `$LIBTOOL --config | $EGREP '^(host|host_os|host_alias|build|build_alias|to_host_file_cmd|to_tool_file_cmd)='`
 configure_options=--prefix=/nonexistent
 if test -n "$host_alias"; then
@@ -92,8 +91,8 @@ AT_KEYWORDS([libtoolize])
 # ---------------------------
 # Fix the expected output of installed libtoolize in presence of --program-*.
 m4_define([_LIBTOOLIZE_TRANSFORM],
-[lt_name=`$ECHO "$LIBTOOLIZE" | sed "s|^.*/||"`
-sed "s/libtoolize/$lt_name/g
+[lt_name=`$ECHO "$LIBTOOLIZE" | $SED "s|^.*/||"`
+$SED "s/libtoolize/$lt_name/g
 s|/usr/local/share/aclocal/|${tst_aclocaldir-$abs_top_srcdir/libltdl/m4}/|" < $1 > $1.t
 mv -f $1.t $1
 ])dnl
@@ -142,7 +141,7 @@ AT_KEYWORDS([autoconf])
 # --------------------------
 m4_define([LT_AT_AUTOMAKE],
 [AT_CHECK([$AUTOMAKE $1], [0], [ignore], [stderr],
-  [AT_CHECK([grep 'require .*but have' stderr && (exit 77)], [1])])
+  [AT_CHECK([$GREP 'require .*but have' stderr && (exit 77)], [1])])
 AT_XFAIL_IF([test no = "$AUTOMAKE"])
 AT_KEYWORDS([automake])
 ])
@@ -165,7 +164,7 @@ m4_define([LT_AT_AUTORECONF],
 	  [m4_define([AC_CONFIG_MACRO_DIRS], m4_defn([AC_CONFIG_MACRO_DIR]))])
 ]])
 AT_CHECK([$AUTORECONF $1], [0], [ignore], [stderr],
-  [AT_CHECK([grep 'require .*but have' stderr && (exit 77)], [1])])
+  [AT_CHECK([$GREP 'require .*but have' stderr && (exit 77)], [1])])
 AT_XFAIL_IF(
   [case ,$AUTORECONF,$AUTOCONF,$AUTOHEADER,$ACLOCAL,$AUTOMAKE, in *,no,*) :;; *) false;; esac])
 AT_KEYWORDS([autoconf automake])
@@ -298,8 +297,8 @@ esac])
 # - location of the libtool script,
 # - error messages involving unstable temporary file names.
 m4_define([LT_AT_NORMALIZE_COMPILER_OUTPUT],
-[_ltbase=`$ECHO "$LIBTOOL" | sed 's|^.*/||'`
-[sed "/^distcc\[[0-9]*\]/d
+[_ltbase=`$ECHO "$LIBTOOL" | $SED 's|^.*/||'`
+[$SED "/^distcc\[[0-9]*\]/d
       /^$_ltbase: compile/d
       s/\(tmp\/\{1,\}cc\)\([a-zA-Z0-9_]\{1,\}\)/\1-normalized-tmpname/g" < $1 > $1.t]
 LT_AT_UNIFY_NL([$1.t], [m4_default([$2], [$1])])[]dnl
@@ -352,6 +351,15 @@ AT_CHECK([{ test -n "[$]$1" && test "X[$]$1" != Xno; } || (exit 77)])
 m4_case([$1],
   [CXX],
   [AT_CHECK([test g++ != "$CXX" || (g++ -v >/dev/null 2>&1) || (exit 77)])],
+  [FC],
+  [# Autoconf will accept f77 or similar as a valid FC, but often f77
+   # will not compile fortran90 code; in that case skip the FC checks.
+   AT_DATA([fc_test.f90],
+[[	program main
+
+	end
+]])
+   AT_CHECK([$FC $FCFLAGS fc_test.f90 || exit 77], [], [ignore], [ignore])],
   [GCJ],
   [# There are just too many broken gcj installations out there, either missing
    # libgcj.spec or unable to find it.  Skip the test for them.
diff --git a/tests/versioning.at b/tests/versioning.at
index d1922a9..dac032c 100644
--- a/tests/versioning.at
+++ b/tests/versioning.at
@@ -1,6 +1,6 @@
 # versioning.at -- test libtool versioning           -*- Autotest -*-
 #
-#   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 #
 #   This file is part of GNU Libtool.
 #
@@ -110,7 +110,7 @@ done
 # Hypothesis: -version-info is ignored for convenience archives.
 AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba.la liba1.lo ]dnl
 	 [-version-info 0:0:0], [], [ignore], [stderr])
-AT_CHECK([grep 'version-info.*ignored for convenience' stderr], [], [ignore])
+AT_CHECK([$GREP 'version-info.*ignored for convenience' stderr], [], [ignore])
 
 # Hypothesis: the deprecated -version-number works.
 # Be sure not to use zero here, it's not portable.
@@ -131,7 +131,7 @@ done
 # Hypothesis: we diagnose when AGE is higher than CURRENT.
 AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba.la liba1.lo ]dnl
 	 [-version-info 1:3:2 -rpath $libdir], [1], [ignore], [stderr])
-AT_CHECK([grep 'AGE.*is greater than' stderr], [], [ignore])
+AT_CHECK([$GREP 'AGE.*is greater than' stderr], [], [ignore])
 
 # Hypothesis: we diagnose invalid values.
 for version_info in 1:2:3:4 -1 0:-1 0:0:-1; do
diff --git a/tests/with-pic.at b/tests/with-pic.at
index 6565320..41adc4f 100644
--- a/tests/with-pic.at
+++ b/tests/with-pic.at
@@ -1,6 +1,6 @@
 # with-pic.at -- test the --with-pic flag -*- Autotest -*-
 
-#   Copyright (C) 2010-2013 Free Software Foundation, Inc.
+#   Copyright (C) 2010-2014 Free Software Foundation, Inc.
 #
 #   This file is part of GNU Libtool.
 #


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Wed Jan 01 18:28:19 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VyVD1-0001tw-4K
	for mharc-libtool-commit@gnu.org; Wed, 01 Jan 2014 18:28:19 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:41315)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VyVCx-0001su-Ve
	for libtool-commit@gnu.org; Wed, 01 Jan 2014 18:28:17 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VyVCm-0003Xo-Dt
	for libtool-commit@gnu.org; Wed, 01 Jan 2014 18:28:15 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:50925)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VyVCm-0003Xk-AF
	for libtool-commit@gnu.org; Wed, 01 Jan 2014 18:28:04 -0500
Received: from gary by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VyVCj-0004yG-PN
	for libtool-commit@gnu.org; Wed, 01 Jan 2014 23:28:04 +0000
Date: Wed, 01 Jan 2014 23:28:01 +0000
Message-Id: <E1VyVCj-0004yG-PN@vcs.savannah.gnu.org>
From: "Peter Rosin" <peda@lysator.liu.se>
To: libtool-commit@gnu.org
Subject: [SCM] GNU Libtool annotated tag, v2.4.2.427, created. v2.4.2.427
X-Git-Refname: refs/tags/v2.4.2.427
X-Git-Reftype: annotated tag
X-Git-Oldrev: 0000000000000000000000000000000000000000
X-Git-Newrev: 70f397e6a9ee6b9215ab74ce9ef5e35f5d7d9e37
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Jan 2014 23:28:17 -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 Libtool".

The annotated tag, v2.4.2.427 has been created
        at  70f397e6a9ee6b9215ab74ce9ef5e35f5d7d9e37 (tag)
   tagging  397f71725630cd6d97fe69104f170861f441507a (commit)
  replaces  v2.4.2.418
 tagged by  Gary V. Vaughan
        on  Thu Jan 2 12:25:45 2014 +1300

- Log -----------------------------------------------------------------
libtool 2.4.2.427
-----BEGIN PGP SIGNATURE-----
Version: GnuPG/MacGPG2 v2.0.22 (Darwin)

iEYEABECAAYFAlLEo/kACgkQFRMICSmD1gbH+gCfTzqhxo74btsICf26pynPXqRB
TWMAniQMGCrQSHZbsWqMkIFDqzq9XxPn
=0+lc
-----END PGP SIGNATURE-----

Gary V. Vaughan (8):
      maint: post-release administrivia
      tests: use autotest as_unset rather than rerolling $unset locally.
      bootstrap: search for a non-truncating sed binary.
      bootstrap: search for a non-truncating grep binary.
      refactor: simplify program path searching in funclib.sh.
      bootstrap: show found GREP and SED in verbose mode.
      funclib.sh: simplify version comparison functions.
      bootstrap: fix a quoting error.

Peter Rosin (1):
      tests: Use a basic grep that matches the basic regexp style.

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


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Wed Jan 01 18:28:28 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VyVDA-0001v5-Af
	for mharc-libtool-commit@gnu.org; Wed, 01 Jan 2014 18:28:28 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:41338)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VyVD8-0001uz-J2
	for libtool-commit@gnu.org; Wed, 01 Jan 2014 18:28:27 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VyVD3-0003Zh-Vc
	for libtool-commit@gnu.org; Wed, 01 Jan 2014 18:28:26 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:50935)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VyVD3-0003Zd-SN
	for libtool-commit@gnu.org; Wed, 01 Jan 2014 18:28:21 -0500
Received: from gary by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VyVD3-000503-HV
	for libtool-commit@gnu.org; Wed, 01 Jan 2014 23:28:21 +0000
Date: Wed, 01 Jan 2014 23:28:21 +0000
Message-Id: <E1VyVD3-000503-HV@vcs.savannah.gnu.org>
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
Subject: [SCM] GNU Libtool annotated tag, v2.4.2.444, created. v2.4.2.444
X-Git-Refname: refs/tags/v2.4.2.444
X-Git-Reftype: annotated tag
X-Git-Oldrev: 0000000000000000000000000000000000000000
X-Git-Newrev: 5809bb1ca229c351b49b349d6ef3d9c4d536a0e5
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Jan 2014 23:28:27 -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 Libtool".

The annotated tag, v2.4.2.444 has been created
        at  5809bb1ca229c351b49b349d6ef3d9c4d536a0e5 (tag)
   tagging  a4ffcdb5e0f207656bb2584b1c4e1702a6d7fa32 (commit)
  replaces  v2.4.2.427
 tagged by  Gary V. Vaughan
        on  Thu Jan 2 12:27:10 2014 +1300

- Log -----------------------------------------------------------------
libtool 2.4.2.444
-----BEGIN PGP SIGNATURE-----
Version: GnuPG/MacGPG2 v2.0.22 (Darwin)

iEYEABECAAYFAlLEpE4ACgkQFRMICSmD1gZZVACgigHrn+jaDqc1wywV5ZFGegZp
7YUAn2FmF9/ktEc4hqtFodlUgEbAo/Dd
=NtvD
-----END PGP SIGNATURE-----

Gary V. Vaughan (15):
      funclib.sh: improve comments.
      tests: skip fcdemo checks when $FC cannot compile fortran90.
      configury: use $(SED) where input does not end in newline.
      configury: remove spurious g modifier in sed expression.
      tests: run cmdline_wrap last, or not at all if anything else failed.
      tests: use $SED throughout.
      tests: use $GREP throughout.
      tests: use TESTS_ENVIRONMENT for EGREP and FGREP.
      maint: use $SED and $GREP, not sed and grep in all scripts.
      testsuite: with SunStudio12.x f77, don't fail on system symbols
      tests: gcj cannot reliably compile directly to .o from .java
      gnulib: update to latest upstream revision.
      maint: update copyright notices to include 2014.
      bootstrap: fix gitlog-to-changelog detection.
      libtool: only strip -Wl when linking with $LD.

Peter Rosin (2):
      bootstrap: fix version sort
      maint: fix out-of-tree autoreconf w/o manual rebootstrap

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


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Wed Jan 01 18:54:00 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VyVbs-0005MC-DI
	for mharc-libtool-commit@gnu.org; Wed, 01 Jan 2014 18:54:00 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:43448)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VyVbp-0005LA-EZ
	for libtool-commit@gnu.org; Wed, 01 Jan 2014 18:53:58 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VyVbo-0000qd-JZ
	for libtool-commit@gnu.org; Wed, 01 Jan 2014 18:53:57 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:51210)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VyVbo-0000qZ-Fx
	for libtool-commit@gnu.org; Wed, 01 Jan 2014 18:53:56 -0500
Received: from gary by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VyVbn-00071Z-Rj
	for libtool-commit@gnu.org; Wed, 01 Jan 2014 23:53:56 +0000
Date: Wed, 01 Jan 2014 23:53:55 +0000
Message-Id: <E1VyVbn-00071Z-Rj@vcs.savannah.gnu.org>
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
Subject: [SCM] GNU Libtool branch, master, updated. v2.4.2.444-1-g8886f3b
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: a4ffcdb5e0f207656bb2584b1c4e1702a6d7fa32
X-Git-Newrev: 8886f3b473da66de42c2f7aa43db7e8789018cca
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Jan 2014 23:53:58 -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 Libtool".

The branch, master has been updated
       via  8886f3b473da66de42c2f7aa43db7e8789018cca (commit)
      from  a4ffcdb5e0f207656bb2584b1c4e1702a6d7fa32 (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 8886f3b473da66de42c2f7aa43db7e8789018cca
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Thu Jan 2 12:52:50 2014 +1300

    maint: change history.
    
    * NEWS: Remove alpha release header.
    * cfg.mk (old_NEWS_hash): Update.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

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

Summary of changes:
 NEWS   |    3 ---
 cfg.mk |    2 +-
 2 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index 4fb1e0a..ecb48b1 100644
--- a/NEWS
+++ b/NEWS
@@ -2,9 +2,6 @@ NEWS - list of user-visible changes between releases of GNU Libtool
 
 * Noteworthy changes in release ?.? (????-??-??) [?]
 
-
-* Noteworthy changes in release 2.4.2.418 (2013-10-27) [alpha]
-
 ** New features:
 
   - Moved to gnulib release infrastructure.
diff --git a/cfg.mk b/cfg.mk
index 6620685..de3aef3 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -24,7 +24,7 @@
 update-copyright-env := UPDATE_COPYRIGHT_FORCE=1 UPDATE_COPYRIGHT_USE_INTERVALS=1
 
 # Set format of NEWS
-old_NEWS_hash := c7c9fc43ba42057e4f8bd593a0c2e086
+old_NEWS_hash := d41d8cd98f00b204e9800998ecf8427e
 
 manual_title = Portable Dynamic Shared Object Management
 


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Wed Jan 01 19:32:55 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VyWDX-000124-H6
	for mharc-libtool-commit@gnu.org; Wed, 01 Jan 2014 19:32:55 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:47453)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VyWDT-000112-VI
	for libtool-commit@gnu.org; Wed, 01 Jan 2014 19:32:52 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VyWDS-0001dk-Uz
	for libtool-commit@gnu.org; Wed, 01 Jan 2014 19:32:51 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:51668)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VyWDS-0001dg-SH
	for libtool-commit@gnu.org; Wed, 01 Jan 2014 19:32:50 -0500
Received: from gary by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VyWDS-0001Za-9o
	for libtool-commit@gnu.org; Thu, 02 Jan 2014 00:32:50 +0000
Date: Thu, 02 Jan 2014 00:32:50 +0000
Message-Id: <E1VyWDS-0001Za-9o@vcs.savannah.gnu.org>
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
Subject: [SCM] GNU Libtool branch, master, updated. v2.4.2.444-2-g581d90b
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 8886f3b473da66de42c2f7aa43db7e8789018cca
X-Git-Newrev: 581d90bacaec6c20d5a5f776bdcdd9512f724192
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Jan 2014 00:32:53 -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 Libtool".

The branch, master has been updated
       via  581d90bacaec6c20d5a5f776bdcdd9512f724192 (commit)
      from  8886f3b473da66de42c2f7aa43db7e8789018cca (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 581d90bacaec6c20d5a5f776bdcdd9512f724192
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Thu Jan 2 13:04:31 2014 +1300

    bootstrap: push Peter's version sort fix back into funclib.sh.
    
    Peter's a7462c5 fix was applied to the generated bootstrap script
    instead of the funclib.sh source, and had have been overwritten
    the next time bootstrap was regenerated.
    * gl/build-aux/funclib.sh (func_sort_ver): Sort numerically on the
    non-primary keys as well.
    * bootstrap: Regenerate, with the change applied.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

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

Summary of changes:
 bootstrap               |    4 ++--
 gl/build-aux/funclib.sh |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bootstrap b/bootstrap
index 6b4cc6d..18323eb 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1327,8 +1327,8 @@ func_sort_ver ()
 {
     $debug_cmd
 
-    printf '%s\n%s\n' "$1" "$2" |
-    sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n
+    printf '%s\n%s\n' "$1" "$2" \
+      | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n
 }
 
 # func_lt_ver PREV CURR
diff --git a/gl/build-aux/funclib.sh b/gl/build-aux/funclib.sh
index 73b3e26..3bd2ab8 100644
--- a/gl/build-aux/funclib.sh
+++ b/gl/build-aux/funclib.sh
@@ -1317,8 +1317,8 @@ func_sort_ver ()
 {
     $debug_cmd
 
-    printf '%s\n%s\n' "$1" "$2" |
-    sort -t. -k1n -k1 -k2n -k2 -k3n -k3 -k4n -k4 -k5n -k5 -k6n -k6 -k7n -k7 -k8n -k8 -k9n -k9
+    printf '%s\n%s\n' "$1" "$2" \
+      | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n
 }
 
 # func_lt_ver PREV CURR


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Thu Jan 02 19:43:37 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VysrR-0001jI-KD
	for mharc-libtool-commit@gnu.org; Thu, 02 Jan 2014 19:43:37 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:35842)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VysrN-0001hU-B8
	for libtool-commit@gnu.org; Thu, 02 Jan 2014 19:43:35 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VysrL-0001pf-2h
	for libtool-commit@gnu.org; Thu, 02 Jan 2014 19:43:33 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:41988)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VysrK-0001pb-UB
	for libtool-commit@gnu.org; Thu, 02 Jan 2014 19:43:31 -0500
Received: from gary by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VysrK-0002oL-ED
	for libtool-commit@gnu.org; Fri, 03 Jan 2014 00:43:30 +0000
Date: Fri, 03 Jan 2014 00:43:30 +0000
Message-Id: <E1VysrK-0002oL-ED@vcs.savannah.gnu.org>
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
Subject: [SCM] GNU Libtool branch, master, updated. v2.4.2.444-3-g95e1f34
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 581d90bacaec6c20d5a5f776bdcdd9512f724192
X-Git-Newrev: 95e1f34f7b1238c2ad3db25c820ded22c93d049f
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Jan 2014 00:43:35 -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 Libtool".

The branch, master has been updated
       via  95e1f34f7b1238c2ad3db25c820ded22c93d049f (commit)
      from  581d90bacaec6c20d5a5f776bdcdd9512f724192 (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 95e1f34f7b1238c2ad3db25c820ded22c93d049f
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Fri Jan 3 13:33:38 2014 +1300

    libtoolize: use printf '%s\n' unconditionally.
    
    It's been a year since the as_echo probes were removed in Autoconf,
    so we can follow suit and remove our equivalent bs_echo probing
    now.  Retain $ECHO in case users need to override default printf
    calls in museum piece environments.
    * gl/build-aux/funclib.sh (ECHO): Default to 'printf %s\n'.
    (bs_echo): Remove.
    Adjust all bs_echo callers to use $ECHO instead.
    * bootstrap: Regenerate.
    * NEWS: Update.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

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

Summary of changes:
 NEWS                        |    9 ++++
 bootstrap                   |  101 +++++++++++++------------------------------
 build-aux/ltmain.in         |    2 +-
 gl/build-aux/bootstrap.in   |   12 +++---
 gl/build-aux/extract-trace  |   10 ++--
 gl/build-aux/funclib.sh     |   65 +++++----------------------
 gl/build-aux/options-parser |   14 +++---
 7 files changed, 70 insertions(+), 143 deletions(-)

diff --git a/NEWS b/NEWS
index ecb48b1..c8730c7 100644
--- a/NEWS
+++ b/NEWS
@@ -99,10 +99,19 @@ NEWS - list of user-visible changes between releases of GNU Libtool
             [m4_define([AC_CONFIG_MACRO_DIRS],
                 m4_defn([AC_CONFIG_MACRO_DIR]))])
 
+  - Overhead of probing for a non-backslash crippled echo equivalent
+    during initialization of every script has been removed in favor of
+    trusting that "printf %s\n" works out of the box on all non-museum
+    host architectures.  Manually setting ECHO appropriately in the
+    build environment will be necessary on some ancient architectures.
+
 ** Changes in supported systems or compilers:
 
   - Support for bitrig (*-*-bitrig*).
 
+  - Solaris 7 and earlier requires ECHO=/usr/ucb/echo in the build
+    environment, to build and use libtool.
+
 New in 2.4.2 2011-10-17: git version 2.4.1a, Libtool team:
 
 * New features:
diff --git a/bootstrap b/bootstrap
index 18323eb..3c30de8 100755
--- a/bootstrap
+++ b/bootstrap
@@ -163,47 +163,6 @@ func_path_progs ()
 }
 
 
-# There are still modern systems that have problems with 'echo' mis-
-# handling backslashes, among others, so make sure $bs_echo is set to a
-# command that correctly interprets backslashes.
-# (this code from Autoconf 2.68)
-
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-bs_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-bs_echo=$bs_echo$bs_echo$bs_echo$bs_echo$bs_echo
-bs_echo=$bs_echo$bs_echo$bs_echo$bs_echo$bs_echo$bs_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $bs_echo`" = "X$bs_echo") 2>/dev/null; then
-  bs_echo='print -r --'
-  bs_echo_n='print -rn --'
-elif (test "X`printf %s $bs_echo`" = "X$bs_echo") 2>/dev/null; then
-  bs_echo='printf %s\n'
-  bs_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $bs_echo) 2>/dev/null`" = "X-n $bs_echo"; then
-    bs_echo_body='eval /usr/ucb/echo -n "$1$nl"'
-    bs_echo_n='/usr/ucb/echo -n'
-  else
-    bs_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    bs_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$nl"*)
-	expr "X$arg" : "X\\(.*\\)$nl";
-	arg=`expr "X$arg" : ".*$nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$nl"
-    '
-    export bs_echo_n_body
-    bs_echo_n='sh -c $bs_echo_n_body bs_echo'
-  fi
-  export bs_echo_body
-  bs_echo='sh -c $bs_echo_body bs_echo'
-fi
-
-
 # We want to be able to use the functions in this file before configure
 # has figured out where the best binaries are kept, which means we have
 # to search for them ourselves - except when the results are already set
@@ -224,13 +183,13 @@ test -z "$SED" && {
     _G_path_prog=$1
 
     _G_count=0
-    $bs_echo_n 0123456789 >conftest.in
+    printf 0123456789 >conftest.in
     while :
     do
       cat conftest.in conftest.in >conftest.tmp
       mv conftest.tmp conftest.in
       cp conftest.in conftest.nl
-      $bs_echo '' >> conftest.nl
+      echo '' >> conftest.nl
       "$_G_path_prog" -f conftest.sed <conftest.nl >conftest.out 2>/dev/null || break
       diff conftest.out conftest.nl >/dev/null 2>&1 || break
       _G_count=`expr $_G_count + 1`
@@ -259,13 +218,13 @@ test -z "$GREP" && {
 
     _G_count=0
     _G_path_prog_max=0
-    $bs_echo_n 0123456789 >conftest.in
+    printf 0123456789 >conftest.in
     while :
     do
       cat conftest.in conftest.in >conftest.tmp
       mv conftest.tmp conftest.in
       cp conftest.in conftest.nl
-      $bs_echo 'GREP' >> conftest.nl
+      echo 'GREP' >> conftest.nl
       "$_G_path_prog" -e 'GREP$' -e '-(cannot match)-' <conftest.nl >conftest.out 2>/dev/null || break
       diff conftest.out conftest.nl >/dev/null 2>&1 || break
       _G_count=`expr $_G_count + 1`
@@ -295,7 +254,7 @@ test -z "$GREP" && {
 # in the command search PATH.
 
 : ${CP="cp -f"}
-: ${ECHO="$bs_echo"}
+: ${ECHO="printf %s\n"}
 : ${EGREP="$GREP -E"}
 : ${FGREP="$GREP -F"}
 : ${LN_S="ln -s"}
@@ -393,13 +352,13 @@ exit_status=$EXIT_SUCCESS
 progpath=$0
 
 # The name of this program.
-progname=`$bs_echo "$progpath" |$SED "$sed_basename"`
+progname=`$ECHO "$progpath" |$SED "$sed_basename"`
 
 # Make sure we have an absolute progpath for reexecution:
 case $progpath in
   [\\/]*|[A-Za-z]:\\*) ;;
   *[\\/]*)
-     progdir=`$bs_echo "$progpath" |$SED "$sed_dirname"`
+     progdir=`$ECHO "$progpath" |$SED "$sed_dirname"`
      progdir=`cd "$progdir" && pwd`
      progpath=$progdir/$progname
      ;;
@@ -593,7 +552,7 @@ func_append_uniq ()
 {
     $debug_cmd
 
-    eval _G_current_value='`$bs_echo $'$1'`'
+    eval _G_current_value='`$ECHO $'$1'`'
     _G_delim=`expr "$2" : '\(.\)'`
 
     case $_G_delim$_G_current_value$_G_delim in
@@ -706,7 +665,7 @@ func_echo ()
     IFS=$nl
     for _G_line in $_G_message; do
       IFS=$func_echo_IFS
-      $bs_echo "$progname: $_G_line"
+      $ECHO "$progname: $_G_line"
     done
     IFS=$func_echo_IFS
 }
@@ -740,8 +699,8 @@ func_echo_infix_1 ()
     for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan"
     do
       test -n "$_G_tc" && {
-        _G_esc_tc=`$bs_echo "$_G_tc" | $SED "$sed_make_literal_regex"`
-        _G_indent=`$bs_echo "$_G_indent" | $SED "s|$_G_esc_tc||g"`
+        _G_esc_tc=`$ECHO "$_G_tc" | $SED "$sed_make_literal_regex"`
+        _G_indent=`$ECHO "$_G_indent" | $SED "s|$_G_esc_tc||g"`
       }
     done
     _G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`"  " ## exclude from sc_prohibit_nested_quotes
@@ -750,7 +709,7 @@ func_echo_infix_1 ()
     IFS=$nl
     for _G_line in $_G_message; do
       IFS=$func_echo_infix_1_IFS
-      $bs_echo "$_G_prefix$tc_bold$_G_line$tc_reset" >&2
+      $ECHO "$_G_prefix$tc_bold$_G_line$tc_reset" >&2
       _G_prefix=$_G_indent
     done
     IFS=$func_echo_infix_1_IFS
@@ -1500,7 +1459,7 @@ func_remove_hook ()
 {
     $debug_cmd
 
-    eval ${1}_hooks='`$bs_echo "\$'$1'_hooks" |$SED "s| '$2'||"`'
+    eval ${1}_hooks='`$ECHO "\$'$1'_hooks" |$SED "s| '$2'||"`'
 }
 
 
@@ -1793,8 +1752,8 @@ func_fatal_help ()
 {
     $debug_cmd
 
-    eval \$bs_echo \""Usage: $usage"\"
-    eval \$bs_echo \""$fatal_help"\"
+    eval \$ECHO \""Usage: $usage"\"
+    eval \$ECHO \""$fatal_help"\"
     func_error ${1+"$@"}
     exit $EXIT_FAILURE
 }
@@ -1808,7 +1767,7 @@ func_help ()
     $debug_cmd
 
     func_usage_message
-    $bs_echo "$long_help_message"
+    $ECHO "$long_help_message"
     exit 0
 }
 
@@ -1895,7 +1854,7 @@ func_usage ()
     $debug_cmd
 
     func_usage_message
-    $bs_echo "Run '$progname --help |${PAGER-more}' for full usage"
+    $ECHO "Run '$progname --help |${PAGER-more}' for full usage"
     exit 0
 }
 
@@ -1907,7 +1866,7 @@ func_usage_message ()
 {
     $debug_cmd
 
-    eval \$bs_echo \""Usage: $usage"\"
+    eval \$ECHO \""Usage: $usage"\"
     echo
     $SED -n 's|^# ||
         /^Written by/{
@@ -1916,7 +1875,7 @@ func_usage_message ()
 	h
 	/^Written by/q' < "$progpath"
     echo
-    eval \$bs_echo \""$usage_message"\"
+    eval \$ECHO \""$usage_message"\"
 }
 
 
@@ -2204,8 +2163,8 @@ func_extract_trace ()
     $require_configure_ac
     $require_gnu_m4
 
-    _G_m4_traces=`$bs_echo "--trace=$1" |$SED 's%,% --trace=%g'`
-    _G_re_macros=`$bs_echo "($1)" |$SED 's%,%|%g'`
+    _G_m4_traces=`$ECHO "--trace=$1" |$SED 's%,% --trace=%g'`
+    _G_re_macros=`$ECHO "($1)" |$SED 's%,%|%g'`
     _G_macros="$1"; shift
     test $# -gt 0 || {
       set dummy $configure_ac
@@ -2307,7 +2266,7 @@ func_extract_trace ()
 
     # Save the command pipeline results for further use by callers of
     # this function.
-    func_extract_trace_result=`$bs_echo "$_G_mini" \
+    func_extract_trace_result=`$ECHO "$_G_mini" \
       |$M4 -daq --prefix $_G_m4_traces - "$@" 2>&1 1>/dev/null \
       |$SED -n -e "$_G_transform"`
 }
@@ -2323,7 +2282,7 @@ func_extract_trace_first ()
     $debug_cmd
 
     func_extract_trace ${1+"$@"}
-    func_extract_trace_first_result=`$bs_echo "$func_extract_trace_result" \
+    func_extract_trace_first_result=`$ECHO "$func_extract_trace_result" \
       |$SED -e 's|:.*$||g' -e 1q`
 }
 
@@ -2359,7 +2318,7 @@ on a separate line.'
 
     # Display results.
     test -n "$func_extract_trace_result" \
-        && $bs_echo "$func_extract_trace_result"
+        && $ECHO "$func_extract_trace_result"
 
     # The End.
     exit $EXIT_SUCCESS
@@ -3486,7 +3445,7 @@ func_require_buildreq_automake ()
 
       # ...and AM_INIT_AUTOMAKE is declared...
       test -n "$func_extract_trace_result" && {
-        automake_version=`$bs_echo "$func_extract_trace_result" \
+        automake_version=`$ECHO "$func_extract_trace_result" \
            |$SED -e 's|[^0-9]*||' -e 's| .*$||'`
         test -n "$automake_version" || automake_version=-
 
@@ -4404,7 +4363,7 @@ func_strpad ()
     $debug_cmd
 
     _G_width=`expr "$2" - 1`
-    func_strpad_result=`$bs_echo "$1" |$SED '
+    func_strpad_result=`$ECHO "$1" |$SED '
         :a
         s|^.\{0,'"$_G_width"'\}$|&'"$3"'|
         ta
@@ -4421,7 +4380,7 @@ func_strrpad ()
     $debug_cmd
 
     _G_width=`expr "$2" - 1`
-    func_strrpad_result=`$bs_echo "$1" |$SED '
+    func_strrpad_result=`$ECHO "$1" |$SED '
         :a
         s|^.\{0,'"$_G_width"'\}$|'"$3"'&|
         ta
@@ -4506,7 +4465,7 @@ func_strtable ()
 
     # Strip off the indent, and make a divider with '-' chars, then
     # reindent.
-    _G_divider=`$bs_echo "$func_strrow_result" \
+    _G_divider=`$ECHO "$func_strrow_result" \
         |$SED 's|[^ ]|-|g
             :a
             s|- |--|g
@@ -4663,7 +4622,7 @@ func_insert_if_absent ()
           || func_verbose "inserting '$str' into '$file'"
 
       linesold=`func_gitignore_entries "$file" |wc -l`
-      linesnew=`{ $bs_echo "$str"; cat "$file"; } \
+      linesnew=`{ $ECHO "$str"; cat "$file"; } \
                 |func_gitignore_entries |sort -u |wc -l`
       test "$linesold" -eq "$linesnew" \
         || { $SED "1i\\$nl$str$nl" "$file" >"$file"T && mv "$file"T "$file"; } \
@@ -4684,7 +4643,7 @@ func_get_version ()
 
     # Rather than uncomment the sed script in-situ, strip the comments
     # programatically before passing the result to $SED for evaluation.
-    sed_get_version=`$bs_echo '# extract version within line
+    sed_get_version=`$ECHO '# extract version within line
           s|.*[v ]\{1,\}\([0-9]\{1,\}\.[.a-z0-9-]*\).*|\1|
           t done
 
diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
index b7c85e2..f452e54 100644
--- a/build-aux/ltmain.in
+++ b/build-aux/ltmain.in
@@ -82,7 +82,7 @@ func_echo ()
     IFS=$nl
     for _G_line in $_G_message; do
       IFS=$func_echo_IFS
-      $bs_echo "$progname${opt_mode+: $opt_mode}: $_G_line"
+      $ECHO "$progname${opt_mode+: $opt_mode}: $_G_line"
     done
     IFS=$func_echo_IFS
 }
diff --git a/gl/build-aux/bootstrap.in b/gl/build-aux/bootstrap.in
index d346fee..5d9311b 100755
--- a/gl/build-aux/bootstrap.in
+++ b/gl/build-aux/bootstrap.in
@@ -1117,7 +1117,7 @@ func_require_buildreq_automake ()
 
       # ...and AM_INIT_AUTOMAKE is declared...
       test -n "$func_extract_trace_result" && {
-        automake_version=`$bs_echo "$func_extract_trace_result" \
+        automake_version=`$ECHO "$func_extract_trace_result" \
            |$SED -e 's|[^0-9]*||' -e 's| .*$||'`
         test -n "$automake_version" || automake_version=-
 
@@ -2035,7 +2035,7 @@ func_strpad ()
     $debug_cmd
 
     _G_width=`expr "$2" - 1`
-    func_strpad_result=`$bs_echo "$1" |$SED '
+    func_strpad_result=`$ECHO "$1" |$SED '
         :a
         s|^.\{0,'"$_G_width"'\}$|&'"$3"'|
         ta
@@ -2052,7 +2052,7 @@ func_strrpad ()
     $debug_cmd
 
     _G_width=`expr "$2" - 1`
-    func_strrpad_result=`$bs_echo "$1" |$SED '
+    func_strrpad_result=`$ECHO "$1" |$SED '
         :a
         s|^.\{0,'"$_G_width"'\}$|'"$3"'&|
         ta
@@ -2137,7 +2137,7 @@ func_strtable ()
 
     # Strip off the indent, and make a divider with '-' chars, then
     # reindent.
-    _G_divider=`$bs_echo "$func_strrow_result" \
+    _G_divider=`$ECHO "$func_strrow_result" \
         |$SED 's|[^ ]|-|g
             :a
             s|- |--|g
@@ -2294,7 +2294,7 @@ func_insert_if_absent ()
           || func_verbose "inserting '$str' into '$file'"
 
       linesold=`func_gitignore_entries "$file" |wc -l`
-      linesnew=`{ $bs_echo "$str"; cat "$file"; } \
+      linesnew=`{ $ECHO "$str"; cat "$file"; } \
                 |func_gitignore_entries |sort -u |wc -l`
       test "$linesold" -eq "$linesnew" \
         || { $SED "1i\\$nl$str$nl" "$file" >"$file"T && mv "$file"T "$file"; } \
@@ -2315,7 +2315,7 @@ func_get_version ()
 
     # Rather than uncomment the sed script in-situ, strip the comments
     # programatically before passing the result to $SED for evaluation.
-    sed_get_version=`$bs_echo '# extract version within line
+    sed_get_version=`$ECHO '# extract version within line
           s|.*[v ]\{1,\}\([0-9]\{1,\}\.[.a-z0-9-]*\).*|\1|
           t done
 
diff --git a/gl/build-aux/extract-trace b/gl/build-aux/extract-trace
index 6b469d2..39138df 100755
--- a/gl/build-aux/extract-trace
+++ b/gl/build-aux/extract-trace
@@ -242,8 +242,8 @@ func_extract_trace ()
     $require_configure_ac
     $require_gnu_m4
 
-    _G_m4_traces=`$bs_echo "--trace=$1" |$SED 's%,% --trace=%g'`
-    _G_re_macros=`$bs_echo "($1)" |$SED 's%,%|%g'`
+    _G_m4_traces=`$ECHO "--trace=$1" |$SED 's%,% --trace=%g'`
+    _G_re_macros=`$ECHO "($1)" |$SED 's%,%|%g'`
     _G_macros="$1"; shift
     test $# -gt 0 || {
       set dummy $configure_ac
@@ -345,7 +345,7 @@ func_extract_trace ()
 
     # Save the command pipeline results for further use by callers of
     # this function.
-    func_extract_trace_result=`$bs_echo "$_G_mini" \
+    func_extract_trace_result=`$ECHO "$_G_mini" \
       |$M4 -daq --prefix $_G_m4_traces - "$@" 2>&1 1>/dev/null \
       |$SED -n -e "$_G_transform"`
 }
@@ -361,7 +361,7 @@ func_extract_trace_first ()
     $debug_cmd
 
     func_extract_trace ${1+"$@"}
-    func_extract_trace_first_result=`$bs_echo "$func_extract_trace_result" \
+    func_extract_trace_first_result=`$ECHO "$func_extract_trace_result" \
       |$SED -e 's|:.*$||g' -e 1q`
 }
 
@@ -397,7 +397,7 @@ on a separate line.'
 
     # Display results.
     test -n "$func_extract_trace_result" \
-        && $bs_echo "$func_extract_trace_result"
+        && $ECHO "$func_extract_trace_result"
 
     # The End.
     exit $EXIT_SUCCESS
diff --git a/gl/build-aux/funclib.sh b/gl/build-aux/funclib.sh
index 3bd2ab8..b2a0583 100644
--- a/gl/build-aux/funclib.sh
+++ b/gl/build-aux/funclib.sh
@@ -153,47 +153,6 @@ func_path_progs ()
 }
 
 
-# There are still modern systems that have problems with 'echo' mis-
-# handling backslashes, among others, so make sure $bs_echo is set to a
-# command that correctly interprets backslashes.
-# (this code from Autoconf 2.68)
-
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-bs_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-bs_echo=$bs_echo$bs_echo$bs_echo$bs_echo$bs_echo
-bs_echo=$bs_echo$bs_echo$bs_echo$bs_echo$bs_echo$bs_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $bs_echo`" = "X$bs_echo") 2>/dev/null; then
-  bs_echo='print -r --'
-  bs_echo_n='print -rn --'
-elif (test "X`printf %s $bs_echo`" = "X$bs_echo") 2>/dev/null; then
-  bs_echo='printf %s\n'
-  bs_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $bs_echo) 2>/dev/null`" = "X-n $bs_echo"; then
-    bs_echo_body='eval /usr/ucb/echo -n "$1$nl"'
-    bs_echo_n='/usr/ucb/echo -n'
-  else
-    bs_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    bs_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$nl"*)
-	expr "X$arg" : "X\\(.*\\)$nl";
-	arg=`expr "X$arg" : ".*$nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$nl"
-    '
-    export bs_echo_n_body
-    bs_echo_n='sh -c $bs_echo_n_body bs_echo'
-  fi
-  export bs_echo_body
-  bs_echo='sh -c $bs_echo_body bs_echo'
-fi
-
-
 # We want to be able to use the functions in this file before configure
 # has figured out where the best binaries are kept, which means we have
 # to search for them ourselves - except when the results are already set
@@ -214,13 +173,13 @@ test -z "$SED" && {
     _G_path_prog=$1
 
     _G_count=0
-    $bs_echo_n 0123456789 >conftest.in
+    printf 0123456789 >conftest.in
     while :
     do
       cat conftest.in conftest.in >conftest.tmp
       mv conftest.tmp conftest.in
       cp conftest.in conftest.nl
-      $bs_echo '' >> conftest.nl
+      echo '' >> conftest.nl
       "$_G_path_prog" -f conftest.sed <conftest.nl >conftest.out 2>/dev/null || break
       diff conftest.out conftest.nl >/dev/null 2>&1 || break
       _G_count=`expr $_G_count + 1`
@@ -249,13 +208,13 @@ test -z "$GREP" && {
 
     _G_count=0
     _G_path_prog_max=0
-    $bs_echo_n 0123456789 >conftest.in
+    printf 0123456789 >conftest.in
     while :
     do
       cat conftest.in conftest.in >conftest.tmp
       mv conftest.tmp conftest.in
       cp conftest.in conftest.nl
-      $bs_echo 'GREP' >> conftest.nl
+      echo 'GREP' >> conftest.nl
       "$_G_path_prog" -e 'GREP$' -e '-(cannot match)-' <conftest.nl >conftest.out 2>/dev/null || break
       diff conftest.out conftest.nl >/dev/null 2>&1 || break
       _G_count=`expr $_G_count + 1`
@@ -285,7 +244,7 @@ test -z "$GREP" && {
 # in the command search PATH.
 
 : ${CP="cp -f"}
-: ${ECHO="$bs_echo"}
+: ${ECHO="printf %s\n"}
 : ${EGREP="$GREP -E"}
 : ${FGREP="$GREP -F"}
 : ${LN_S="ln -s"}
@@ -383,13 +342,13 @@ exit_status=$EXIT_SUCCESS
 progpath=$0
 
 # The name of this program.
-progname=`$bs_echo "$progpath" |$SED "$sed_basename"`
+progname=`$ECHO "$progpath" |$SED "$sed_basename"`
 
 # Make sure we have an absolute progpath for reexecution:
 case $progpath in
   [\\/]*|[A-Za-z]:\\*) ;;
   *[\\/]*)
-     progdir=`$bs_echo "$progpath" |$SED "$sed_dirname"`
+     progdir=`$ECHO "$progpath" |$SED "$sed_dirname"`
      progdir=`cd "$progdir" && pwd`
      progpath=$progdir/$progname
      ;;
@@ -583,7 +542,7 @@ func_append_uniq ()
 {
     $debug_cmd
 
-    eval _G_current_value='`$bs_echo $'$1'`'
+    eval _G_current_value='`$ECHO $'$1'`'
     _G_delim=`expr "$2" : '\(.\)'`
 
     case $_G_delim$_G_current_value$_G_delim in
@@ -696,7 +655,7 @@ func_echo ()
     IFS=$nl
     for _G_line in $_G_message; do
       IFS=$func_echo_IFS
-      $bs_echo "$progname: $_G_line"
+      $ECHO "$progname: $_G_line"
     done
     IFS=$func_echo_IFS
 }
@@ -730,8 +689,8 @@ func_echo_infix_1 ()
     for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan"
     do
       test -n "$_G_tc" && {
-        _G_esc_tc=`$bs_echo "$_G_tc" | $SED "$sed_make_literal_regex"`
-        _G_indent=`$bs_echo "$_G_indent" | $SED "s|$_G_esc_tc||g"`
+        _G_esc_tc=`$ECHO "$_G_tc" | $SED "$sed_make_literal_regex"`
+        _G_indent=`$ECHO "$_G_indent" | $SED "s|$_G_esc_tc||g"`
       }
     done
     _G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`"  " ## exclude from sc_prohibit_nested_quotes
@@ -740,7 +699,7 @@ func_echo_infix_1 ()
     IFS=$nl
     for _G_line in $_G_message; do
       IFS=$func_echo_infix_1_IFS
-      $bs_echo "$_G_prefix$tc_bold$_G_line$tc_reset" >&2
+      $ECHO "$_G_prefix$tc_bold$_G_line$tc_reset" >&2
       _G_prefix=$_G_indent
     done
     IFS=$func_echo_infix_1_IFS
diff --git a/gl/build-aux/options-parser b/gl/build-aux/options-parser
index f6c8017..ff7ae3b 100644
--- a/gl/build-aux/options-parser
+++ b/gl/build-aux/options-parser
@@ -146,7 +146,7 @@ func_remove_hook ()
 {
     $debug_cmd
 
-    eval ${1}_hooks='`$bs_echo "\$'$1'_hooks" |$SED "s| '$2'||"`'
+    eval ${1}_hooks='`$ECHO "\$'$1'_hooks" |$SED "s| '$2'||"`'
 }
 
 
@@ -439,8 +439,8 @@ func_fatal_help ()
 {
     $debug_cmd
 
-    eval \$bs_echo \""Usage: $usage"\"
-    eval \$bs_echo \""$fatal_help"\"
+    eval \$ECHO \""Usage: $usage"\"
+    eval \$ECHO \""$fatal_help"\"
     func_error ${1+"$@"}
     exit $EXIT_FAILURE
 }
@@ -454,7 +454,7 @@ func_help ()
     $debug_cmd
 
     func_usage_message
-    $bs_echo "$long_help_message"
+    $ECHO "$long_help_message"
     exit 0
 }
 
@@ -541,7 +541,7 @@ func_usage ()
     $debug_cmd
 
     func_usage_message
-    $bs_echo "Run '$progname --help |${PAGER-more}' for full usage"
+    $ECHO "Run '$progname --help |${PAGER-more}' for full usage"
     exit 0
 }
 
@@ -553,7 +553,7 @@ func_usage_message ()
 {
     $debug_cmd
 
-    eval \$bs_echo \""Usage: $usage"\"
+    eval \$ECHO \""Usage: $usage"\"
     echo
     $SED -n 's|^# ||
         /^Written by/{
@@ -562,7 +562,7 @@ func_usage_message ()
 	h
 	/^Written by/q' < "$progpath"
     echo
-    eval \$bs_echo \""$usage_message"\"
+    eval \$ECHO \""$usage_message"\"
 }
 
 


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Thu Jan 02 21:05:59 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Vyu98-000494-Ud
	for mharc-libtool-commit@gnu.org; Thu, 02 Jan 2014 21:05:58 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:44848)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Vyu93-00047y-C4
	for libtool-commit@gnu.org; Thu, 02 Jan 2014 21:05:56 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Vyu90-0004aR-Af
	for libtool-commit@gnu.org; Thu, 02 Jan 2014 21:05:53 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:43040)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Vyu90-0004aJ-62
	for libtool-commit@gnu.org; Thu, 02 Jan 2014 21:05:50 -0500
Received: from gary by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Vyu8z-0000fw-6b
	for libtool-commit@gnu.org; Fri, 03 Jan 2014 02:05:49 +0000
Date: Fri, 03 Jan 2014 02:05:49 +0000
Message-Id: <E1Vyu8z-0000fw-6b@vcs.savannah.gnu.org>
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
Subject: [SCM] GNU Libtool branch, master, updated. v2.4.2.444-6-ge0bb18f
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 95e1f34f7b1238c2ad3db25c820ded22c93d049f
X-Git-Newrev: e0bb18f4ef8b4ed6ff4453795c96436a68f80501
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Jan 2014 02:05:56 -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 Libtool".

The branch, master has been updated
       via  e0bb18f4ef8b4ed6ff4453795c96436a68f80501 (commit)
       via  8708e2e9489d481ac2a1dcb63e8eacfa2acdb05a (commit)
       via  d0625cae8afaa2b2201a20304dd691943ae944db (commit)
      from  95e1f34f7b1238c2ad3db25c820ded22c93d049f (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 e0bb18f4ef8b4ed6ff4453795c96436a68f80501
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Fri Jan 3 14:59:24 2014 +1300

    inline-source: add a DO NOT EDIT notice to generated files.
    
    * gl/build-aux/inline-source (func_include): Add a DO NOT EDIT
    notice below the #! magic number of generated files.
    * gl/build-aux/bootstrap.in (func_require_bootstrap_uptodate):
    Remove write bit from regenerated bootstrap.new if it differs
    from incumbent bootstrap.
    Change the update instructions to recommend `mv -f` to cope with
    no write permission on old bootstrap script.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

commit 8708e2e9489d481ac2a1dcb63e8eacfa2acdb05a
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Fri Jan 3 14:24:51 2014 +1300

    bootstrap: move included files below DO NOT EDIT comment.
    
    * gl/build-aux/bootstrap.in: Reorder sections to load external
    libraries as late as possible, leaving DO NOT EDIT comment
    visible near the top of the generated bootstrap script.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

commit d0625cae8afaa2b2201a20304dd691943ae944db
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Fri Jan 3 14:20:12 2014 +1300

    maint: use before-save-hook in Emacs footers.
    
    Updating to Emacs 24 now gives me warnings about write-file-hooks
    being obsolete.
    * gl/build-aux/bootstrap.in, gl/build-aux/extract-trace,
    gl/build-aux/funclib.sh, gl/build-aux/inline-source,
    gl/build-aux/options-parser: Set before-save-hook in Emacs file
    footers instead of obsolete write-file-hooks.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

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

Summary of changes:
 bootstrap                   |  458 ++++++++++++++++++++++---------------------
 gl/build-aux/bootstrap.in   |   28 ++-
 gl/build-aux/extract-trace  |    2 +-
 gl/build-aux/funclib.sh     |    4 +-
 gl/build-aux/inline-source  |   16 ++-
 gl/build-aux/options-parser |    4 +-
 6 files changed, 270 insertions(+), 242 deletions(-)

diff --git a/bootstrap b/bootstrap
index 3c30de8..f6ea4da 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,4 +1,6 @@
 #! /bin/sh
+## DO NOT EDIT - This file generated from build-aux/bootstrap.in
+##               by inline-source v2014-01-03.01
 
 # Bootstrap an Autotooled package from checked-out sources.
 # Written by Gary V. Vaughan, 2010
@@ -7,9 +9,228 @@
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
+# 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 3 of the License, 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/>.
+
+# Originally written by Paul Eggert.  The canonical version of this
+# script is maintained as build-aux/bootstrap in gnulib, however, to
+# be useful to your project, you should place a copy of it under
+# version control in the top-level directory of your project.  The
+# intent is that all customization can be done with a bootstrap.conf
+# file also maintained in your version control; gnulib comes with a
+# template build-aux/bootstrap.conf to get you started.
+
+# Please report bugs or propose patches to bug-gnulib@gnu.org.
+
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# Most GNUish projects do not keep all of the generated Autotool
+# files under version control, but running all of the right tools
+# with the right arguments, in the correct order to regenerate
+# all of those files in readiness for configuration and building
+# can be surprisingly involved!  Many projects have a 'bootstrap'
+# script under version control to invoke Autotools and perform
+# other assorted book-keeping with version numbers and the like.
+#
+# This bootstrap script aims to probe the configure.ac and top
+# Makefile.am of your project to automatically determine what
+# the correct ordering and arguments are and then run the tools for
+# you.  In order to use it, you can generate an initial standalone
+# script with:
+#
+#   gl/build-aux/inline-source gl/build-aux/bootstrap.in > bootstrap
+#
+# You should then store than script in version control for other
+# developers in you project.  It will give you instructions about
+# how to keep it up to date if the sources change.
+#
+# See gl/doc/bootstrap.texi for documentation on how to write
+# a bootstrap.conf to customize it for your project's
+# idiosyncracies.
+
+
+## ================================================================== ##
+##                                                                    ##
+##     DO NOT EDIT THIS FILE, CUSTOMIZE IT USING A BOOTSTRAP.CONF     ##
+##                                                                    ##
+## ================================================================== ##
+
+## ------------------------------- ##
+## User overridable command paths. ##
+## ------------------------------- ##
+
+# All uppercase denotes values stored in the environment.  These
+# variables should generally be overridden by the user - however, we do
+# set them to 'true' in some parts of this script to prevent them being
+# called at the wrong time by other tools that we call ('autoreconf',
+# for example).
+#
+# We also allow 'LIBTOOLIZE', 'M4', 'SHA1SUM' and some others to be
+# overridden, and export the result for child processes, but they are
+# handled by the function 'func_find_tool' and not defaulted in this
+# section.
+
+: ${ACLOCAL="aclocal"}
+: ${AUTOCONF="autoconf"}
+: ${AUTOHEADER="autoheader"}
+: ${AUTOM4TE="autom4te"}
+: ${AUTOHEADER="autoheader"}
+: ${AUTOMAKE="automake"}
+: ${AUTOPOINT="autopoint"}
+: ${AUTORECONF="autoreconf"}
+: ${CMP="cmp"}
+: ${CONFIG_SHELL="/bin/sh"}
+: ${DIFF="diff"}
+: ${GIT="git"}
+: ${LN_S="ln -s"}
+: ${RM="rm"}
+
+export ACLOCAL
+export AUTOCONF
+export AUTOHEADER
+export AUTOM4TE
+export AUTOHEADER
+export AUTOMAKE
+export AUTOPOINT
+export AUTORECONF
+export CONFIG_SHELL
+
+
+## -------------- ##
+## Configuration. ##
+## -------------- ##
+
+# A newline delimited list of triples of programs (that respond to
+# --version), the minimum version numbers required (or just '-' in the
+# version field if any version will be sufficient) and homepage URLs
+# to help locate missing packages.
+buildreq=
+
+# Name of a file containing instructions on installing missing packages
+# required in 'buildreq'.
+buildreq_readme=README-hacking
+
+# These are extracted from AC_INIT in configure.ac, though you can
+# override those values in 'bootstrap.conf' if you prefer.
+build_aux=
+macro_dir=
+package=
+package_name=
+package_version=
+package_bugreport=
+
+# These are extracted from 'gnulib-cache.m4', or else fall-back
+# automatically on the gnulib defaults; unless you set the values
+# manually in 'bootstrap.conf'.
+doc_base=
+gnulib_mk=
+gnulib_name=
+local_gl_dir=
+source_base=
+tests_base=
+
+# The list of gnulib modules required at 'gnulib-tool' time.  If you
+# check 'gnulib-cache.m4' into your repository, then this list will be
+# extracted automatically.
+gnulib_modules=
+
+# Extra gnulib files that are not in modules, which override files of
+# the same name installed by other bootstrap tools.
+gnulib_non_module_files="
+        build-aux/compile
+        build-aux/install-sh
+        build-aux/mdate-sh
+        build-aux/texinfo.tex
+        build-aux/depcomp
+        build-aux/config.guess
+        build-aux/config.sub
+        doc/INSTALL
+"
+
+# Relative path to the local gnulib submodule, and url to the upstream
+# git repository. If you have a gnulib entry in your .gitmodules file,
+# these values are ignored.
+gnulib_path=
+gnulib_url=
+
+# Additional gnulib-tool options to use.
+gnulib_tool_options="
+        --no-changelog
+"
+
+# bootstrap removes any macro-files that are not included by aclocal.m4,
+# except for files listed in this variable that are always kept.
+gnulib_precious="
+        gnulib-tool.m4
+"
+
+# When truncating long commands for display, always allow at least this
+# many characters before truncating.
+min_cmd_len=160
+
+# The command to download all .po files for a specified domain into
+# a specified directory.  Fill in the first %s is the domain name, and
+# the second with the destination directory.  Use rsync's -L and -r
+# options because the latest/%s directory and the .po files within are
+# all symlinks.
+po_download_command_format=\
+"rsync --delete --exclude '*.s1' -Lrtvz \
+'translationproject.org::tp/latest/%s/' '%s'"
+
+# Other locale categories that need message catalogs.
+extra_locale_categories=
+
+# Additional xgettext options to use.  Gnulib might provide you with an
+# extensive list of additional options to append to this, but gettext
+# 0.16.1 and newer appends them automaticaly, so you can safely ignore
+# the complaints from 'gnulib-tool' if your $configure_ac states:
+#
+#    AM_GNU_GETTEXT_VERSION([0.16.1])
+xgettext_options="
+        --flag=_:1:pass-c-format
+        --flag=N_:1:pass-c-format
+"
+
+# Package copyright holder for gettext files.  Defaults to FSF if unset.
+copyright_holder=
+
+# File that should exist in the top directory of a checked out hierarchy,
+# but not in a distribution tarball.
+checkout_only_file=
+
+# Whether to use copies instead of symlinks by default (if set to true,
+# the --copy option has no effect).
+copy=false
+
+# Set this to ".cvsignore .gitignore" in 'bootstrap.conf' if you want
+# those files to be generated in directories like 'lib/', 'm4/', and 'po/',
+# or set it to "auto" to make this script select what to use based
+# on what version control system (if any) is used in the source directory.
+# Or set it to "none" to ignore VCS ignore files entirely.  Default is
+# "auto".
+vc_ignore=
+
+
+## ------------------- ##
+## External Libraries. ##
+## ------------------- ##
+
 # Source required external libraries:
 # Set a version string for this script.
-scriptversion=2013-10-28.05; # UTC
+scriptversion=2014-01-03.01; # UTC
 
 # General shell script boiler plate, and helper functions.
 # Written by Gary V. Vaughan, 2004
@@ -1307,14 +1528,16 @@ func_lt_ver ()
 # Local variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
 # time-stamp-time-zone: "UTC"
 # End:
 #! /bin/sh
+## DO NOT EDIT - This file generated from build-aux/options-parser
+##               by inline-source v2014-01-03.01
 
 # Set a version string for this script.
-scriptversion=2012-10-21.11; # UTC
+scriptversion=2014-01-03.01; # UTC
 
 # A portable, pluggable option parser for Bourne shell.
 # Written by Gary V. Vaughan, 2010
@@ -1915,11 +2138,13 @@ func_version ()
 # Local variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
 # time-stamp-time-zone: "UTC"
 # End:
 #! /bin/sh
+## DO NOT EDIT - This file generated from build-aux/extract-trace
+##               by inline-source v2014-01-03.01
 
 # Extract macro arguments from autotools input with GNU M4.
 # Written by Gary V. Vaughan, 2010
@@ -2335,227 +2560,13 @@ test extract-trace = "$progname" && func_main "$@"
 # Local variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
 # time-stamp-time-zone: "UTC"
 # End:
 
 # Set a version string for *this* script.
-scriptversion=2014-01-01.22; # UTC
-
-# 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 3 of the License, 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/>.
-
-# Originally written by Paul Eggert.  The canonical version of this
-# script is maintained as build-aux/bootstrap in gnulib, however, to
-# be useful to your project, you should place a copy of it under
-# version control in the top-level directory of your project.  The
-# intent is that all customization can be done with a bootstrap.conf
-# file also maintained in your version control; gnulib comes with a
-# template build-aux/bootstrap.conf to get you started.
-
-# Please report bugs or propose patches to bug-gnulib@gnu.org.
-
-
-## ------ ##
-## Usage. ##
-## ------ ##
-
-# Most GNUish projects do not keep all of the generated Autotool
-# files under version control, but running all of the right tools
-# with the right arguments, in the correct order to regenerate
-# all of those files in readiness for configuration and building
-# can be surprisingly involved!  Many projects have a 'bootstrap'
-# script under version control to invoke Autotools and perform
-# other assorted book-keeping with version numbers and the like.
-#
-# This bootstrap script aims to probe the configure.ac and top
-# Makefile.am of your project to automatically determine what
-# the correct ordering and arguments are and then run the tools for
-# you.  In order to use it, you can generate an initial standalone
-# script with:
-#
-#   gl/build-aux/inline-source gl/build-aux/bootstrap.in > bootstrap
-#
-# You should then store than script in version control for other
-# developers in you project.  It will give you instructions about
-# how to keep it up to date if the sources change.
-#
-# See gl/doc/bootstrap.texi for documentation on how to write
-# a bootstrap.conf to customize it for your project's
-# idiosyncracies.
-
-
-## ================================================================== ##
-##                                                                    ##
-##     DO NOT EDIT THIS FILE, CUSTOMIZE IT USING A BOOTSTRAP.CONF     ##
-##                                                                    ##
-## ================================================================== ##
-
-## ------------------------------- ##
-## User overridable command paths. ##
-## ------------------------------- ##
-
-# All uppercase denotes values stored in the environment.  These
-# variables should generally be overridden by the user - however, we do
-# set them to 'true' in some parts of this script to prevent them being
-# called at the wrong time by other tools that we call ('autoreconf',
-# for example).
-#
-# We also allow 'LIBTOOLIZE', 'M4', 'SHA1SUM' and some others to be
-# overridden, and export the result for child processes, but they are
-# handled by the function 'func_find_tool' and not defaulted in this
-# section.
-
-: ${ACLOCAL="aclocal"}
-: ${AUTOCONF="autoconf"}
-: ${AUTOHEADER="autoheader"}
-: ${AUTOM4TE="autom4te"}
-: ${AUTOHEADER="autoheader"}
-: ${AUTOMAKE="automake"}
-: ${AUTOPOINT="autopoint"}
-: ${AUTORECONF="autoreconf"}
-: ${CMP="cmp"}
-: ${CONFIG_SHELL="/bin/sh"}
-: ${DIFF="diff"}
-: ${GIT="git"}
-: ${LN_S="ln -s"}
-: ${RM="rm"}
-
-export ACLOCAL
-export AUTOCONF
-export AUTOHEADER
-export AUTOM4TE
-export AUTOHEADER
-export AUTOMAKE
-export AUTOPOINT
-export AUTORECONF
-export CONFIG_SHELL
-
-
-## -------------- ##
-## Configuration. ##
-## -------------- ##
-
-# A newline delimited list of triples of programs (that respond to
-# --version), the minimum version numbers required (or just '-' in the
-# version field if any version will be sufficient) and homepage URLs
-# to help locate missing packages.
-buildreq=
-
-# Name of a file containing instructions on installing missing packages
-# required in 'buildreq'.
-buildreq_readme=README-hacking
-
-# These are extracted from AC_INIT in configure.ac, though you can
-# override those values in 'bootstrap.conf' if you prefer.
-build_aux=
-macro_dir=
-package=
-package_name=
-package_version=
-package_bugreport=
-
-# These are extracted from 'gnulib-cache.m4', or else fall-back
-# automatically on the gnulib defaults; unless you set the values
-# manually in 'bootstrap.conf'.
-doc_base=
-gnulib_mk=
-gnulib_name=
-local_gl_dir=
-source_base=
-tests_base=
-
-# The list of gnulib modules required at 'gnulib-tool' time.  If you
-# check 'gnulib-cache.m4' into your repository, then this list will be
-# extracted automatically.
-gnulib_modules=
-
-# Extra gnulib files that are not in modules, which override files of
-# the same name installed by other bootstrap tools.
-gnulib_non_module_files="
-        build-aux/compile
-        build-aux/install-sh
-        build-aux/mdate-sh
-        build-aux/texinfo.tex
-        build-aux/depcomp
-        build-aux/config.guess
-        build-aux/config.sub
-        doc/INSTALL
-"
-
-# Relative path to the local gnulib submodule, and url to the upstream
-# git repository. If you have a gnulib entry in your .gitmodules file,
-# these values are ignored.
-gnulib_path=
-gnulib_url=
-
-# Additional gnulib-tool options to use.
-gnulib_tool_options="
-        --no-changelog
-"
-
-# bootstrap removes any macro-files that are not included by aclocal.m4,
-# except for files listed in this variable that are always kept.
-gnulib_precious="
-        gnulib-tool.m4
-"
-
-# When truncating long commands for display, always allow at least this
-# many characters before truncating.
-min_cmd_len=160
-
-# The command to download all .po files for a specified domain into
-# a specified directory.  Fill in the first %s is the domain name, and
-# the second with the destination directory.  Use rsync's -L and -r
-# options because the latest/%s directory and the .po files within are
-# all symlinks.
-po_download_command_format=\
-"rsync --delete --exclude '*.s1' -Lrtvz \
-'translationproject.org::tp/latest/%s/' '%s'"
-
-# Other locale categories that need message catalogs.
-extra_locale_categories=
-
-# Additional xgettext options to use.  Gnulib might provide you with an
-# extensive list of additional options to append to this, but gettext
-# 0.16.1 and newer appends them automaticaly, so you can safely ignore
-# the complaints from 'gnulib-tool' if your $configure_ac states:
-#
-#    AM_GNU_GETTEXT_VERSION([0.16.1])
-xgettext_options="
-        --flag=_:1:pass-c-format
-        --flag=N_:1:pass-c-format
-"
-
-# Package copyright holder for gettext files.  Defaults to FSF if unset.
-copyright_holder=
-
-# File that should exist in the top directory of a checked out hierarchy,
-# but not in a distribution tarball.
-checkout_only_file=
-
-# Whether to use copies instead of symlinks by default (if set to true,
-# the --copy option has no effect).
-copy=false
-
-# Set this to ".cvsignore .gitignore" in 'bootstrap.conf' if you want
-# those files to be generated in directories like 'lib/', 'm4/', and 'po/',
-# or set it to "auto" to make this script select what to use based
-# on what version control system (if any) is used in the source directory.
-# Or set it to "none" to ignore VCS ignore files entirely.  Default is
-# "auto".
-vc_ignore=
+scriptversion=2014-01-03.01; # UTC
 
 
 ## ------------------- ##
@@ -3312,11 +3323,12 @@ updates available."
         rm -f bootstrap.new
 	func_verbose "bootstrap script up to date"
       else
+        chmod 555 bootstrap.new
         func_warning upgrade "\
 An updated bootstrap script has been generated for you in
 'bootstrap.new'.  After you've verified that you want
 the changes, you can update with:
-    cat bootstrap.new > $progname
+    mv -f bootstrap.new $progname
     ./$progname
 
 Or you can disable this check permanently by adding the
@@ -5007,7 +5019,7 @@ exit ${exit_status-$EXIT_SUCCESS}
 # Local variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-pattern: "20/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-pattern: "500/scriptversion=%:y-%02m-%02d.%02H; # UTC"
 # time-stamp-time-zone: "UTC"
 # End:
diff --git a/gl/build-aux/bootstrap.in b/gl/build-aux/bootstrap.in
index 5d9311b..9591384 100755
--- a/gl/build-aux/bootstrap.in
+++ b/gl/build-aux/bootstrap.in
@@ -7,14 +7,6 @@
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-# Source required external libraries:
-. `echo "$0" |${SED-sed} 's|[^/]*$||'`"funclib.sh"
-. `echo "$0" |${SED-sed} 's|[^/]*$||'`"options-parser"
-. `echo "$0" |${SED-sed} 's|[^/]*$||'`"extract-trace"
-
-# Set a version string for *this* script.
-scriptversion=2014-01-01.22; # UTC
-
 # 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 3 of the License, or
@@ -231,6 +223,19 @@ vc_ignore=
 
 
 ## ------------------- ##
+## External Libraries. ##
+## ------------------- ##
+
+# Source required external libraries:
+. `echo "$0" |${SED-sed} 's|[^/]*$||'`"funclib.sh"
+. `echo "$0" |${SED-sed} 's|[^/]*$||'`"options-parser"
+. `echo "$0" |${SED-sed} 's|[^/]*$||'`"extract-trace"
+
+# Set a version string for *this* script.
+scriptversion=2014-01-03.01; # UTC
+
+
+## ------------------- ##
 ## Hookable functions. ##
 ## ------------------- ##
 
@@ -984,11 +989,12 @@ updates available."
         rm -f bootstrap.new
 	func_verbose "bootstrap script up to date"
       else
+        chmod 555 bootstrap.new
         func_warning upgrade "\
 An updated bootstrap script has been generated for you in
 'bootstrap.new'.  After you've verified that you want
 the changes, you can update with:
-    cat bootstrap.new > $progname
+    mv -f bootstrap.new $progname
     ./$progname
 
 Or you can disable this check permanently by adding the
@@ -2679,7 +2685,7 @@ exit ${exit_status-$EXIT_SUCCESS}
 # Local variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-pattern: "20/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-pattern: "500/scriptversion=%:y-%02m-%02d.%02H; # UTC"
 # time-stamp-time-zone: "UTC"
 # End:
diff --git a/gl/build-aux/extract-trace b/gl/build-aux/extract-trace
index 39138df..e18ed90 100755
--- a/gl/build-aux/extract-trace
+++ b/gl/build-aux/extract-trace
@@ -414,7 +414,7 @@ test extract-trace = "$progname" && func_main "$@"
 # Local variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
 # time-stamp-time-zone: "UTC"
 # End:
diff --git a/gl/build-aux/funclib.sh b/gl/build-aux/funclib.sh
index b2a0583..981941d 100644
--- a/gl/build-aux/funclib.sh
+++ b/gl/build-aux/funclib.sh
@@ -1,5 +1,5 @@
 # Set a version string for this script.
-scriptversion=2013-10-28.05; # UTC
+scriptversion=2014-01-03.01; # UTC
 
 # General shell script boiler plate, and helper functions.
 # Written by Gary V. Vaughan, 2004
@@ -1297,7 +1297,7 @@ func_lt_ver ()
 # Local variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
 # time-stamp-time-zone: "UTC"
 # End:
diff --git a/gl/build-aux/inline-source b/gl/build-aux/inline-source
index 1e99a16..54cce33 100755
--- a/gl/build-aux/inline-source
+++ b/gl/build-aux/inline-source
@@ -12,7 +12,7 @@
 . `echo "$0" |${SED-sed} 's|[^/]*$||'`"options-parser"
 
 # Set a version string for *this* script.
-scriptversion=2012-10-11.10; # UTC
+scriptversion=2014-01-03.01; # UTC
 
 
 # This program is free software: you can redistribute it and/or modify
@@ -124,6 +124,16 @@ func_include ()
     test -n "$_G_scriptdir" || _G_scriptdir="./"
 
     $AWK '
+        BEGIN { domagic = true; }
+
+        /^#!/ && domagic == true {
+            print $0;
+            print "## DO NOT EDIT - This file generated from '$1'";
+            print "##               by '$progname' v'$scriptversion'";
+            domagic = false;
+            next;
+        }
+
         /^\. ['\''"].*['\''"]$/ {
             file = substr ($2, 2, length ($2) -2);
 	    system (sprintf ("'$progpath' %s", file));
@@ -148,7 +158,7 @@ exit 0
 # Local variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-pattern: "20/scriptversion=%:y-%02m-%02d.%02H; # UTC"
 # time-stamp-time-zone: "UTC"
 # End:
diff --git a/gl/build-aux/options-parser b/gl/build-aux/options-parser
index ff7ae3b..4c18aab 100644
--- a/gl/build-aux/options-parser
+++ b/gl/build-aux/options-parser
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # Set a version string for this script.
-scriptversion=2012-10-21.11; # UTC
+scriptversion=2014-01-03.01; # UTC
 
 # A portable, pluggable option parser for Bourne shell.
 # Written by Gary V. Vaughan, 2010
@@ -602,7 +602,7 @@ func_version ()
 # Local variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
 # time-stamp-time-zone: "UTC"
 # End:


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Thu Jan 02 23:56:29 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Vywo9-0002sv-Hl
	for mharc-libtool-commit@gnu.org; Thu, 02 Jan 2014 23:56:29 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:36875)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Vywo1-0002rr-Au
	for libtool-commit@gnu.org; Thu, 02 Jan 2014 23:56:28 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Vywnx-0005Ns-1I
	for libtool-commit@gnu.org; Thu, 02 Jan 2014 23:56:21 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:44984)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Vywnw-0005Nn-S2
	for libtool-commit@gnu.org; Thu, 02 Jan 2014 23:56:16 -0500
Received: from gary by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Vywnv-0004CE-8q
	for libtool-commit@gnu.org; Fri, 03 Jan 2014 04:56:15 +0000
Date: Fri, 03 Jan 2014 04:56:15 +0000
Message-Id: <E1Vywnv-0004CE-8q@vcs.savannah.gnu.org>
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
Subject: [SCM] GNU Libtool branch, master, updated. v2.4.2.444-11-g9f8717e
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: e0bb18f4ef8b4ed6ff4453795c96436a68f80501
X-Git-Newrev: 9f8717edbcb133d0aa3fa797e56de83432acd941
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Jan 2014 04:56:28 -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 Libtool".

The branch, master has been updated
       via  9f8717edbcb133d0aa3fa797e56de83432acd941 (commit)
       via  87dfbe2c86c117c14a2cfa053c4b2ca9b02ed3fa (commit)
       via  596fd58a484133a433a3fb941ffeaf9c815ac6d8 (commit)
       via  4357284ea9899cb50176b75baaeba9ee74687efa (commit)
       via  b42d44b157e59c1a46ca022ce2a8c402ec790026 (commit)
      from  e0bb18f4ef8b4ed6ff4453795c96436a68f80501 (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 9f8717edbcb133d0aa3fa797e56de83432acd941
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Fri Jan 3 17:54:28 2014 +1300

    libtool: rearrange header comments for correct version/help extraction.
    
    * m4/libtool.m4 (_LT_COPYING): Rearrange the comments output to
    the generated libtool script so that --version and --help behave
    the same as pre-funclib.sh revisions.
    (_LT_CONFIG_SAVE_COMMANDS): Likewise.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

commit 87dfbe2c86c117c14a2cfa053c4b2ca9b02ed3fa
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Fri Jan 3 17:01:18 2014 +1300

    README: Tweak into markdown format and fix some bitrot.
    
    * README: Moved from here...
    * README.md: ...to here.  Make some changes to be valid markdown
    format, and fix some inaccuracies in text that is out of date.
    * .gitignore: Add README.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

commit 596fd58a484133a433a3fb941ffeaf9c815ac6d8
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Fri Jan 3 16:45:18 2014 +1300

    bootstrap: support automake README requirement.
    
    * gl/build-aux/bootstrap.in (func_ensure_README): New function.
    Link missing README to existing alternative naming.
    (require_automake_options): New functions. Fetch AM_INIT_AUTOMAKE
    options from configure.ac.
    (func_reconfigure): If we're using automake, and it's not in
    foreign mode, link a README file if possible.
    * bootstrap: Regenerate.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

commit 4357284ea9899cb50176b75baaeba9ee74687efa
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Fri Jan 3 16:01:53 2014 +1300

    configury: use bootstrap ChangeLog management feature.
    
    * gl/build-aux/bootstrap.in (func_autoreconf): Accept an optional
    directory argument to pass to $AUTORECONF.
    Update doc-comment.
    * bootstrap.conf (func_reconfigure): Remove. Don't completely
    overwrite bootstrap's func_reconfigure, shadowing auto-ChangeLog
    management.
    (func_autopoint, func_libtoolize): Overwrite these un-needed
    calls instead.
    (libtool_autoreconf_libltdl): New hook function to run second
    autoreconf in libltdl directory.
    (libtool_force_changelog): Remove.  This is all handled by
    bootstrap's func_reconfigure again.
    * bootstrap: Regenerate.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

commit b42d44b157e59c1a46ca022ce2a8c402ec790026
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Fri Jan 3 15:55:30 2014 +1300

    bootstrap: force remove file droppings from previous run.
    
    Now that we generate bootstrap.new with no write permission,
    we have to force remove it before writing now content to the file.
    * bootstrap.in (require_bootstrap_uptodate): Remove old
    bootstrap.new output.
    * bootstrap: Regenerate.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

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

Summary of changes:
 .gitignore                |    1 +
 README                    |  326 ---------------------------------------------
 README.md                 |  261 ++++++++++++++++++++++++++++++++++++
 bootstrap                 |   65 ++++++++-
 bootstrap.conf            |   51 +++-----
 gl/build-aux/bootstrap.in |   65 ++++++++-
 m4/libtool.m4             |   43 +++----
 7 files changed, 419 insertions(+), 393 deletions(-)
 delete mode 100644 README
 create mode 100644 README.md

diff --git a/.gitignore b/.gitignore
index ae6c32f..c3016d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,6 +48,7 @@
 /release
 Makefile
 Makefile.in
+README
 \#*#
 _libs
 acinclude.m4
diff --git a/README b/README
deleted file mode 100644
index 3ef1bf1..0000000
--- a/README
+++ /dev/null
@@ -1,326 +0,0 @@
-GNU Libtool
-***********
-
-1. Introduction
-===============
-
-This is GNU Libtool, a generic library support script.  Libtool hides
-the complexity of using shared libraries behind a consistent, portable
-interface.
-
-Libtool's home page is:
-
-    http://www.gnu.org/software/libtool/libtool.html
-
-See the file NEWS for a description of recent changes to Libtool.
-
-Please note that you can build GNU Libtool from this directory using a
-vendor Make program as long as this is an official release tarball;
-otherwise you will need GNU Make for sane VPATH support.  See the file
-INSTALL for complete generic instructions on how to build and install
-Libtool.  Also, see the file doc/notes.txt for some platform- specific
-information.
-
-See the info node (libtool)Tested Platforms. (or the file doc/PLATFORMS)
-for a list of platforms that Libtool already supports.
-
-Please try it on all the platforms you have access to:
-
- * If it builds and passes the test suite ('gmake check'), please send
-   a short note to the libtool mailing list <libtool@gnu.org> with a
-   subject line including the string '[PLATFORM]', and containing the
-   details from the end of './libtool --help' in the body.
- * Otherwise, see 'Reporting Bugs' below for how to help us fix any
-   problems you discover.
-
-To use Libtool, add the new generic library building commands to your
-Makefile, Makefile.in, or Makefile.am.  See the documentation for
-details.
-
-
-2. Reporting Bugs
-=================
-
-If this distribution doesn't work for you, before you report the
-problem, at least try upgrading to the latest released version first,
-and see whether the issue persists.  If you feel able, you can also
-check whether the issue has been fixed in the development sources for
-the next release (see 'Obtaining the Latest Sources' below).
-
-Once you've determined that your bug is still not fixed in the latest
-version, please send a full report to <bug-libtool@gnu.org>, including:
-
-  1. the information from the end of the help message given by
-     './libtool --help', and the verbose output of any failed tests
-     (see 'The Test Suites' immediately below);
-  2. complete instructions for how to reproduce your bug, along with
-     the results you were expecting, and how they differ from what you
-     actually see;
-  3. a workaround or full fix for the bug, if you have it;
-  4. a copy of 'tests/testsuite.log' if you are experiencing failures
-     in the Autotest testsuite.
-  5. new test cases for the testsuite that demonstrate the bug are
-     especially welcome, and will help to ensure that future releases
-     don't reintroduce the problem - if you're not able to write a
-     complete testsuite case, a simple standalone shell script is
-     usually good enough to help us write a test for you.
-
-If you have any other suggestions, or if you wish to port Libtool to a
-new platform, please send email to the mailing list <libtool@gnu.org>.
-
-Please note that if you send us an non-trivial code for inclusion in a
-future release, we may ask you for a copyright assignment (for brief
-details see the 'Copyright Assignment' section on our 'Contributing'
-webpage <http://www.gnu.org/software/libtool/contribute.html>).
-
-
-3. The Test Suites
-==================
-
-Libtool comes with two integrated sets of tests to check that your build
-is sane.  You can run both test suites like this, assuming that 'gmake'
-refers to GNU make:
-
-    gmake -k check
-
-If you want to run the old testsuite only, do it like this:
-
-    gmake check TESTSUITEFLAGS=-V
-
-If you want to run the new testsuite only, do it like this:
-
-    gmake check-local
-
-The tests of the old test suite run in groups in the various demo
-subdirectories, so if one of the tests early in a group FAILs, the rest
-of the tests in that group will be SKIPped.  If you see a FAIL further
-into a group, even if a test with the same name PASSes in another test
-group, you need to take note of the name of the first test in the group
-if you want to rerun the group with FAILures to get verbose output.
-
-To run a test group of the old test suite in isolation (say, you think
-you have fixed a bug, but don't want to rerun the entire suite), you can
-do it like this:
-
-    gmake check TESTSUITEFLAGS=-V TESTS="tests/cdemo-static.test \
-        tests/cdemo-static-make.test tests/cdemo-static-exec.test"
-
-Providing that you have a FAIL from the most recent group from a
-particular demo directory (like the cdemo-static.test group above), you
-can explore the state of the directory to help with debugging.
-
-If you wish to report a test group failure to the libtool list, you need
-to send the verbose output of the FAILing group, along with the
-information from the end of '$(top_builddir)/libtool --help' to the bug
-report mailing list, <bug-libtool@gnu.org> with a subject line that
-includes the string '[TEST FAILURE]'.  The file test-suite.log contains
-the verbose output from all failed tests.
-
-In order to enable debug shell tracing, you can set VERBOSE=debug when
-running the old test suite.
-
-In the long run, Libtool will move to using only the new, Autotest-
-driven testsuite.  Its usage is documented in:
-
-    info Autoconf 'testsuite Invocation'
-
-but simple help may also be obtained through:
-
-    gmake check-local TESTSUITEFLAGS='--help'
-
-For verbose output, add the flag '-v', for running only a subset of the
-independent tests, merely specify them by number or by keyword, both of
-which are displayed with the '--list' flag.  For example, the 'libtool'
-keyword is used for the tests that exercise only this script.  So it is
-possible to test an installed script, possibly from a different Libtool
-release, with:
-
-    gmake check-local \
-        TESTSUITEFLAGS="-k libtool LIBTOOL=/path/to/libtool"
-
-Some tests, like the one exercising max_cmd_len limits, make use of this
-to invoke the testsuite recursively on a subset of tests.  For these
-tests, the variable INNER_TESTSUITEFLAGS may be used.  It will be
-expanded right after the '-k libtool', without separating whitespace, so
-that further limiting of the recursive set of tests is possible.  For
-example, to run only the template tests within the max_cmd_len, use:
-
-    gmake check-local TESTSUITEFLAGS="-v -x -k max_cmd_len \
-		      INNER_TESTSUITEFLAGS=',template -v -x'"
-
-If you wish to report test failures to the libtool list, you need to
-send the file 'tests/testsuite.log' to the bug report mailing list,
-<bug-libtool@gnu.org>.
-
-
-4. Obtaining the Latest Sources
-===============================
-
-* With the exception of ancient releases, all official GNU Libtool
-  releases have a detached GPG signature file.  With this you can verify
-  that the corresponding file (i.e. without the '.sig' suffix) is the
-  same file that was released by the owner of it's GPG key ID.  First,
-  be sure to download both the .sig file and the corresponding release,
-  then run a command like this:
-
-    gpg --verify libtool-x.y.z.tar.gz.sig
-
-  If that command fails because you don't have the required public key,
-  then run this command to import it:
-
-    gpg --keyserver keys.gnupg.net --recv-keys 2983D606
-
-  and then rerun the 'gpg --verify' command.
-
-* Official stable releases of GNU Libtool, along with these detached
-  signature files are available from:
-
-    ftp://ftp.gnu.org/gnu/libtool
-
-  To reduce load on the main server, please use one of the mirrors
-  listed at:
-
-    http://www.gnu.org/order/ftp.html
-
-* Alpha quality pre-releases of GNU Libtool, also with detached
-  signature files are available from:
-
-    ftp://alpha.gnu.org/gnu/libtool
-
-  and some of the mirrors listed at:
-
-    http://www.gnu.org/order/ftp.html
-
-* Nightly snapshots of the unreleased development trunk of GNU Libtool
-  are available from:
-
-    http://pogma.com/libtool
-
-  These files do not have signatures, but will allow you to easily
-  determine whether the most recent development code still exhibits any
-  bugs you have discovered, without requiring you to install a complete
-  build environment and the extra tools needed to bootstrap a version
-  control checkout.
-
-* The master libtool repository is stored in git.
-
-  If you are a member of the savannah group for GNU Libtool, a writable
-  copy of the libtool repository can be obtained by:
-
-    git clone <savannah-user>@git.sv.gnu.org:/srv/git/libtool.git
-
-  If you are behind a firewall that blocks the git protocol, you may
-  find it useful to use
-
-    git config --global url.http://git.sv.gnu.org/r/.insteadof \
-      git://git.sv.gnu.org/
-
-  to force git to transparently rewrite all savannah git references to
-  use http.
-
-  If you are not a member of the savannah group for GNU Libtool, you can
-  still fetch a read-only copy with either:
-
-    git clone git://git.sv.gnu.org/libtool.git
-
-  or using the CVS pserver protocol:
-
-    cvs -d:pserver:anonymous@pserver.git.sv.gnu.org:/srv/git/libtool.git \
-        co -d libtool HEAD
-
-* Before you can build from git, you need to bootstrap.  This requires:
-  - Autoconf 2.62 or later
-  - Automake 1.11.1 or later
-  - Help2man 1.29 or later
-  - Xz 4.999.8beta or later (from <http://tukaani.org/xz>)
-  - Texinfo 4.8 or later
-  - Any prerequisites of the above (such as m4, perl, tex)
-
-  Note that these bootstrapping dependencies are much stricter than
-  those required to use a destributed release for your own packages.
-  After installation, GNU Libtool is designed to work either standalone,
-  or optionally with:
-  - Autoconf 2.59 or later
-  - Automake 1.9.6 or later
-
-* The 'bootstrap' script sets up the source directory for you to hack,
-  though it may take quite some time to run.  If you don't intend to
-  re-run the test suite, you can speed up the 'bootstrap' step by an
-  order of magnitude if you call it like this instead:
-
-    reconfdirs='. libltdl' ./bootstrap
-
-
-5. Version Numbering
-====================
-
-People have complained that they find the version numbering scheme under
-which libtool is released confusing... so we've changed it!
-
-It works like this:
-
-	<major-number>.<minor-number>
-
-Releases with a <major-number> less than 1 were not yet feature
-complete.  Releases with a <major-number> of 1 used the old numbering
-scheme that everyone disliked so much.  Releases with a <major-number>
-of 2 us the new scheme described here.  If libtool ever undergoes a
-major rewrite or substantial restructuring, the <major-number> will be
-incremented again.
-
-If we make a patch release to fix bugs in a stable release, we use a
-third number, so:
-
-      <major-number>.<minor-number>.<micro-number>
-
-Version numbers are chosen to make it easy for users to decide two
-things:
-
-  Q: How 'developed' is this release?
-  A: The higher the number, the better!
-  Q: How 'stable' is this release?
-  A: - If the <minor-number> is even, it is a stable release, '2.0'.
-     - If the <minor-number> is odd, it is a development version with
-       new features compared to the last stable release, '2.1a'.
-     - If it has an 'odd'[1] letter after the version number,  it is a
-       snapshot direct from CVS, '2.1a'.
-     - If it has an 'even'[1] letter after the version number, it is an
-       alpha quality release, '2.1b'.
-     - If it has three numbers in the version, it is a patch release,
-       fixing bugs from the stable release (with no new features), '2.0.1'.
-
-[1] We always increment the letter in the repository before *and* after
-    making a release tarball.  This means that "odd" letters
-    (a,c,e,g...) only exist in the repository, and "even" letters are
-    used instantaneously for an alpha release.  Since the odd lettered
-    version numbers cover many states of the tree, we also qualify them
-    by adding the cvs version of the ChangeLog:
-
-    $ libtool --version
-    ltmain.sh (GNU libtool 1.1603 2004/09/12 22:02:07) 2.1a
-
-    Copyright (C) 2004, 2011-2014 Free Software Foundation, Inc.
-    This is free software; see the source for copying conditions.  There is NO
-    warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-For more details about version numbers, see:
-
-    http://www.gnu.org/software/libtool/contribute.html
---
-  Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-  Foundation, Inc.
-  Written by Gary V. Vaughan, 2004
-
-  This file is part of GNU Libtool.
-
-Copying and distribution of this file, with or without modification,
-are permitted in any medium without royalty provided the copyright
-notice and this notice are preserved.  This file is offered as-is,
-without warranty of any kind.
-
-
-Local Variables:
-mode: text
-fill-column: 72
-End:
-vim:tw=72
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..96898b4
--- /dev/null
+++ b/README.md
@@ -0,0 +1,261 @@
+# GNU Libtool
+
+1. Introduction
+===============
+
+[GNU Libtool][libtool] is a generic library support script.
+[Libtool][] hides the complexity of using shared libraries behind a
+consistent, portable interface.
+
+Libtool's home page is:
+
+    http://www.gnu.org/software/libtool/libtool.html
+
+See the file [NEWS][] for a description of recent changes to Libtool.
+
+Please note that you can build GNU Libtool from this directory using a
+vendor Make program as long as this is an official release tarball;
+otherwise you will need GNU Make for sane VPATH support.  See the file
+[INSTALL][] for complete generic instructions on how to build and install
+Libtool.  Also, see the file [doc/notes.txt][notes] for some platform-
+specific information.
+
+See the info node (libtool)Tested Platforms. (or the file
+[doc/PLATFORMS][platforms]) for a list of platforms that Libtool already
+supports.
+
+Please try it on all the platforms you have access to:
+
+ * If it builds and passes the test suite (`gmake check`), please send
+   a short note to the [libtool mailing list][libtool list] with a
+   subject line including the string `[PLATFORM]`, and containing the
+   details from the end of `./libtool --help` in the body.
+ * Otherwise, see _Reporting Bugs_ below for how to help us fix any
+   problems you discover.
+
+To use Libtool, add the new generic library building commands to your
+`Makefile`, `Makefile.in`, or `Makefile.am`.  See the documentation for
+details.
+
+[install]: http://git.savannah.gnu.org/cgit/libtool.git/tree/INSTALL
+[libtool]: http://www.gnu.org/s/libtool
+[libtool list]: mailto:libtool@gnu.org
+[news]: http://git.savannah.gnu.org/cgit/libtool.git/tree/NEWS
+[notes]: http://git.savannah.gnu.org/cgit/libtool.git/tree/doc/notes.texi
+[platforms]: http://git.savannah.gnu.org/cgit/libtool.git/tree/doc/PLATFORMS
+
+
+2. Reporting Bugs
+=================
+
+If this distribution doesn't work for you, before you report the
+problem, at least try upgrading to the latest released version first,
+and see whether the issue persists.  If you feel able, you can also
+check whether the issue has been fixed in the development sources for
+the next release (see _Obtaining the Latest Sources_ below).
+
+Once you've determined that your bug is still not fixed in the latest
+version, please send a full report to the libtool [bug mailing list][],
+including:
+
+  1. the information from the end of the help message given by
+     `./libtool --help`, and the verbose output of any failed tests
+     (see _The Test Suites_ immediately below);
+  2. complete instructions for how to reproduce your bug, along with
+     the results you were expecting, and how they differ from what you
+     actually see;
+  3. a workaround or full fix for the bug, if you have it;
+  4. a copy of `tests/testsuite.log` if you are experiencing failures
+     in the Autotest testsuite.
+  5. new test cases for the testsuite that demonstrate the bug are
+     especially welcome, and will help to ensure that future releases
+     don't reintroduce the problem - if you're not able to write a
+     complete testsuite case, a simple standalone shell script is
+     usually good enough to help us write a test for you.
+
+If you have any other suggestions, or if you wish to port Libtool to a
+new platform, please send email to the [mailing list][libtool list].
+
+Please note that if you send us an non-trivial code for inclusion in a
+future release, we may ask you for a copyright assignment (for brief
+details see the 'Copyright Assignment' section on our
+[Contributing][contribute] webpage.
+
+[bug mailing list]: mailto:bug-libtool@gnu.org
+[contribute]: http://www.gnu.org/software/libtool/contribute.html
+
+
+3. The Test Suite
+=================
+
+Libtool comes an integrated sets of tests to check that your build
+is sane.  You can run like this, assuming that `gmake` refers to GNU
+make:
+
+    gmake check
+
+The new, Autotest-driven testsuite is documented in:
+
+    info Autoconf 'testsuite Invocation'
+
+but simple help may also be obtained through:
+
+    gmake check TESTSUITEFLAGS='--help'
+
+For verbose output, add the flag '-v', for running only a subset of the
+independent tests, merely specify them by number or by keyword, both of
+which are displayed with the '--list' flag.  For example, the 'libtool'
+keyword is used for the tests that exercise only this script.  So it is
+possible to test an installed script, possibly from a different Libtool
+release, with:
+
+    gmake check \
+        TESTSUITEFLAGS="-k libtool LIBTOOL=/path/to/libtool"
+
+Some tests, like the one exercising `max_cmd_len` limits, make use of
+this to invoke the testsuite recursively on a subset of tests.  For these
+tests, the variable `INNER_TESTSUITEFLAGS` may be used.  It will be
+expanded right after the `-k libtool`, without separating whitespace, so
+that further limiting of the recursive set of tests is possible.  For
+example, to run only the template tests within the `max_cmd_len`, use:
+
+    gmake check TESTSUITEFLAGS="-v -x -k max_cmd_len \
+	 	INNER_TESTSUITEFLAGS=',template -v -x'"
+
+If you wish to report test failures to the libtool list, you need to
+send the file `tests/testsuite.log` to the [bug mailing list][].
+
+
+4. Obtaining the Latest Sources
+===============================
+
+* With the exception of ancient releases, all official GNU Libtool
+  releases have a detached GPG signature file.  With this you can verify
+  that the corresponding file (i.e. without the `.sig` suffix) is the
+  same file that was released by the owner of it's GPG key ID.  First,
+  be sure to download both the .sig file and the corresponding release,
+  then run a command like this:
+
+      gpg --verify libtool-x.y.z.tar.gz.sig
+
+  If that command fails because you don't have the required public key,
+  then run this command to import it:
+
+      gpg --keyserver keys.gnupg.net --recv-keys 2983D606
+
+  and then rerun the `gpg --verify` command.
+
+* Official stable releases of GNU Libtool, along with these detached
+  signature files are available from:
+
+      ftp://ftp.gnu.org/gnu/libtool
+
+  To reduce load on the main server, please use one of the mirrors
+  listed at:
+
+      http://www.gnu.org/order/ftp.html
+
+* Alpha quality pre-releases of GNU Libtool, also with detached
+  signature files are available from:
+
+      ftp://alpha.gnu.org/gnu/libtool
+
+  and some of the mirrors listed at:
+
+      http://www.gnu.org/order/ftp.html
+
+* The master libtool repository is stored in git.
+
+  If you are a member of the savannah group for GNU Libtool, a writable
+  copy of the libtool repository can be obtained by:
+
+      git clone <savannah-user>@git.sv.gnu.org:/srv/git/libtool.git
+
+  If you are behind a firewall that blocks the git protocol, you may
+  find it useful to use
+
+      git config --global url.http://git.sv.gnu.org/r/.insteadof \
+        git://git.sv.gnu.org/
+
+  to force git to transparently rewrite all savannah git references to
+  use http.
+
+  If you are not a member of the savannah group for GNU Libtool, you can
+  still fetch a read-only copy with either:
+
+      git clone git://git.sv.gnu.org/libtool.git
+
+  or using the CVS pserver protocol:
+
+      cvs -d:pserver:anonymous@pserver.git.sv.gnu.org:/srv/git/libtool.git \
+          co -d libtool HEAD
+
+* Before you can build from git, you need to bootstrap.  This requires:
+  - Autoconf 2.62 or later
+  - Automake 1.11.1 or later
+  - Help2man 1.29 or later
+  - Xz 4.999.8beta or later (from [tukaani.org](http://tukaani.org/xz))
+  - Texinfo 4.8 or later
+  - Any prerequisites of the above (such as m4, perl, tex)
+
+  Note that these bootstrapping dependencies are much stricter than
+  those required to use a destributed release for your own packages.
+  After installation, GNU Libtool is designed to work either standalone,
+  or optionally with:
+  - Autoconf 2.59 or later
+  - Automake 1.9.6 or later
+
+* The `bootstrap` script sets up the source directory for you to hack.
+
+
+5. Version Numbering
+====================
+
+People have complained that they find the version numbering scheme under
+which libtool is released confusing... so we've changed it!
+
+It works like this:
+
+    <major-number>.<minor-number>
+
+Releases with a **major-number** less than 1 were not yet feature
+complete.  Releases with a **major-number** of 1 used the old numbering
+scheme that everyone disliked so much.  Releases with a **major-number**
+of 2 us the new scheme described here.  If libtool ever undergoes a
+major rewrite or substantial restructuring, the **major-number** will be
+incremented again.
+
+If we make a patch release to fix bugs in a stable release, we use a
+third number, so:
+
+    2.4.2
+
+If we make an alpha quality prerelease, we use a fourth number for the
+number of changsets applied since the version it's based on:
+
+    2.4.2.418
+
+And finally, if you build an unreleased version it will have a short git
+revision hash string in hexadecimal appended to all of that:
+
+    2.4.2.418.3-30eaa
+
+--
+  Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+  Foundation, Inc.
+
+  Written by Gary V. Vaughan, 2004
+
+  This file is part of GNU Libtool.
+
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
+
+
+Local Variables:
+mode: text
+fill-column: 72
+End:
+vim:tw=72
diff --git a/bootstrap b/bootstrap
index f6ea4da..44cd0cd 100755
--- a/bootstrap
+++ b/bootstrap
@@ -2690,6 +2690,14 @@ func_reconfigure ()
 {
     $debug_cmd
 
+    $require_automake_options
+
+    # Automake (without 'foreign' option) requires that README exists.
+    case " $automake_options " in
+      " foreign ") ;;
+      *) func_ensure_README ;;
+    esac
+
     # Ensure ChangeLog presence.
     if test -n "$gnulib_modules"; then
       func_ifcontains "$gnulib_modules" gitlog-to-changelog \
@@ -2704,7 +2712,7 @@ func_reconfigure ()
     fi
 
     # Released 'autopoint' has the tendency to install macros that have
-    # been obsoleted in current 'gnulib., so run this before 'gnulib-tool'.
+    # been obsoleted in current 'gnulib', so run this before 'gnulib-tool'.
     func_autopoint
 
     # Autoreconf runs 'aclocal' before 'libtoolize', which causes spurious
@@ -3016,12 +3024,44 @@ EOT
 }
 
 
-# func_autoreconf
-# ---------------
+# func_ensure_README
+# ------------------
+# Without AM_INIT_AUTOMAKE([foreign]), automake will not run to
+# completion with no README file, even though README.md or README.txt
+# is often preferable.
+func_ensure_changelog ()
+{
+    $debug_cmd
+
+    test -f README || {
+      _G_README=
+      for _G_readme in README.txt README.md README.rst; do
+        test -f $_G_readme && break
+      done
+
+      test -f $_G_readme && $LN_S $_G_readme README
+      func_verbose "$LN_S $_G_readme README"
+    }
+
+    return 0
+}
+
+
+# func_autoreconf [SUBDIR]
+# ------------------------
 # Being careful not to re-run 'autopoint' or 'libtoolize', and not to
 # try to run 'autopoint', 'libtoolize' or 'autoheader' on packages that
 # don't use them, defer to 'autoreconf' for execution of the remaining
 # autotools to bootstrap this package.
+#
+# Projects with multiple trees to reconfigure can hook another call to
+# this function onto func_reconfigure:
+#
+#    my_autoreconf_foo ()
+#    {
+#        func_autoreconf foo
+#    }
+#    func_add_hook func_reconfigure my_autoreconf_foo
 func_autoreconf ()
 {
     $debug_cmd
@@ -3038,7 +3078,7 @@ func_autoreconf ()
     $opt_copy || func_append _G_autoreconf_options " --symlink"
     $opt_force && func_append _G_autoreconf_options " --force"
     $opt_verbose && func_append _G_autoreconf_options " --verbose"
-    func_show_eval "$AUTORECONF$_G_autoreconf_options --install" 'exit $?'
+    func_show_eval "$AUTORECONF$_G_autoreconf_options --install${1+ $1}" 'exit $?'
 
     AUTOPOINT=$save_AUTOPOINT
     LIBTOOLIZE=$save_LIBTOOLIZE
@@ -3263,6 +3303,21 @@ func_require_autoheader ()
 }
 
 
+# require_automake_options
+# ------------------------
+# Extract options from AM_AUTOMAKE_INIT.
+require_automake_options=func_require_automake_options
+func_require_automake_options ()
+{
+    $debug_cmd
+
+    func_extract_trace AM_INIT_AUTOMAKE
+    automake_options=$func_extract_trace_result
+
+    require_automake_options=:
+}
+
+
 # require_autopoint
 # -----------------
 # Skip autopoint if it's not needed.
@@ -3317,6 +3372,7 @@ Please add bootstrap to your gnulib_modules list in
 'bootstrap.conf', so that I can tell you when there are
 updates available."
     else
+      rm -f bootstrap.new
       $build_aux/inline-source $build_aux/bootstrap.in > bootstrap.new
 
       if func_cmp_s "$progpath" bootstrap.new; then
@@ -4058,7 +4114,6 @@ func_require_macro_dir ()
 # require_makefile_am
 # -------------------
 # Ensure there is a 'Makefile.am' in the current directory.
-# names an existing file.
 require_makefile_am=func_require_makefile_am
 func_require_makefile_am ()
 {
diff --git a/bootstrap.conf b/bootstrap.conf
index 6365ca6..c8614cb 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -109,37 +109,21 @@ libtool_obsolete_files="
 ## Override functions. ##
 ## ------------------- ##
 
-# func_reconfigure
-# ------------------
-# In addition to needing to autoreconf two directories, Libtool provides
-# 'libtoolize' and doesn't use 'autopoint', so we can use a somewhat
-# simpler 'func_reconfigure' implementation than bootstrap's version.
-func_reconfigure ()
+# func_autopoint
+# --------------
+# Libtool does not use autopoint.
+func_autopoint ()
 {
     $debug_cmd
+}
 
-    $require_autoheader
-    $require_build_aux
-    $require_ltdl_dir
-    $require_macro_dir
-
-    # Only need this from the top level directory
-    func_gnulib_tool
-
-    export LIBTOOLIZE
-    func_verbose "export LIBTOOLIZE='$LIBTOOLIZE'"
-
-    my_autoreconf_options=
-    $opt_copy || func_append my_autoreconf_options " --symlink"
-    $opt_force && func_append my_autoreconf_options " --force"
-    $opt_verbose && func_append my_autoreconf_options " --verbose"
-
-    func_show_eval "$AUTORECONF$my_autoreconf_options --install ." \
-      'exit $?'
 
-    # Also bootstrap libltdl ready for installation.
-    func_show_eval "$AUTORECONF$my_autoreconf_options --install $ltdl_dir" \
-      'exit $?'
+# func_libtoolize
+# ---------------
+# Libtoolize is part of Libtool!
+func_libtoolize ()
+{
+    $debug_cmd
 }
 
 
@@ -231,16 +215,17 @@ libtool_build_prerequisites ()
 func_add_hook func_gnulib_tool libtool_build_prerequisites
 
 
-# libtool_force_changelog
-# -----------------------
-# Automake requires that ChangeLog exist.
-libtool_force_changelog ()
+# libtool_autoreconf_libltdl
+# --------------------------
+# Libtldl directory needs to be autoreconfed too.
+libtool_autoreconf_libltdl ()
 {
     $debug_cmd
 
-    echo "Autogenerated by 'make dist'" > ChangeLog || exit 1
+    # Also bootstrap libltdl ready for installation.
+    func_autoreconf libltdl
 }
-func_add_hook func_gnulib_tool libtool_force_changelog
+func_add_hook func_reconfigure libtool_autoreconf_libltdl
 
 
 # libtool_readme_release_package_substitutions
diff --git a/gl/build-aux/bootstrap.in b/gl/build-aux/bootstrap.in
index 9591384..d596c84 100755
--- a/gl/build-aux/bootstrap.in
+++ b/gl/build-aux/bootstrap.in
@@ -356,6 +356,14 @@ func_reconfigure ()
 {
     $debug_cmd
 
+    $require_automake_options
+
+    # Automake (without 'foreign' option) requires that README exists.
+    case " $automake_options " in
+      " foreign ") ;;
+      *) func_ensure_README ;;
+    esac
+
     # Ensure ChangeLog presence.
     if test -n "$gnulib_modules"; then
       func_ifcontains "$gnulib_modules" gitlog-to-changelog \
@@ -370,7 +378,7 @@ func_reconfigure ()
     fi
 
     # Released 'autopoint' has the tendency to install macros that have
-    # been obsoleted in current 'gnulib., so run this before 'gnulib-tool'.
+    # been obsoleted in current 'gnulib', so run this before 'gnulib-tool'.
     func_autopoint
 
     # Autoreconf runs 'aclocal' before 'libtoolize', which causes spurious
@@ -682,12 +690,44 @@ EOT
 }
 
 
-# func_autoreconf
-# ---------------
+# func_ensure_README
+# ------------------
+# Without AM_INIT_AUTOMAKE([foreign]), automake will not run to
+# completion with no README file, even though README.md or README.txt
+# is often preferable.
+func_ensure_changelog ()
+{
+    $debug_cmd
+
+    test -f README || {
+      _G_README=
+      for _G_readme in README.txt README.md README.rst; do
+        test -f $_G_readme && break
+      done
+
+      test -f $_G_readme && $LN_S $_G_readme README
+      func_verbose "$LN_S $_G_readme README"
+    }
+
+    return 0
+}
+
+
+# func_autoreconf [SUBDIR]
+# ------------------------
 # Being careful not to re-run 'autopoint' or 'libtoolize', and not to
 # try to run 'autopoint', 'libtoolize' or 'autoheader' on packages that
 # don't use them, defer to 'autoreconf' for execution of the remaining
 # autotools to bootstrap this package.
+#
+# Projects with multiple trees to reconfigure can hook another call to
+# this function onto func_reconfigure:
+#
+#    my_autoreconf_foo ()
+#    {
+#        func_autoreconf foo
+#    }
+#    func_add_hook func_reconfigure my_autoreconf_foo
 func_autoreconf ()
 {
     $debug_cmd
@@ -704,7 +744,7 @@ func_autoreconf ()
     $opt_copy || func_append _G_autoreconf_options " --symlink"
     $opt_force && func_append _G_autoreconf_options " --force"
     $opt_verbose && func_append _G_autoreconf_options " --verbose"
-    func_show_eval "$AUTORECONF$_G_autoreconf_options --install" 'exit $?'
+    func_show_eval "$AUTORECONF$_G_autoreconf_options --install${1+ $1}" 'exit $?'
 
     AUTOPOINT=$save_AUTOPOINT
     LIBTOOLIZE=$save_LIBTOOLIZE
@@ -929,6 +969,21 @@ func_require_autoheader ()
 }
 
 
+# require_automake_options
+# ------------------------
+# Extract options from AM_AUTOMAKE_INIT.
+require_automake_options=func_require_automake_options
+func_require_automake_options ()
+{
+    $debug_cmd
+
+    func_extract_trace AM_INIT_AUTOMAKE
+    automake_options=$func_extract_trace_result
+
+    require_automake_options=:
+}
+
+
 # require_autopoint
 # -----------------
 # Skip autopoint if it's not needed.
@@ -983,6 +1038,7 @@ Please add bootstrap to your gnulib_modules list in
 'bootstrap.conf', so that I can tell you when there are
 updates available."
     else
+      rm -f bootstrap.new
       $build_aux/inline-source $build_aux/bootstrap.in > bootstrap.new
 
       if func_cmp_s "$progpath" bootstrap.new; then
@@ -1724,7 +1780,6 @@ func_require_macro_dir ()
 # require_makefile_am
 # -------------------
 # Ensure there is a 'Makefile.am' in the current directory.
-# names an existing file.
 require_makefile_am=func_require_makefile_am
 func_require_makefile_am ()
 {
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 900b172..ce58f31 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -8,33 +8,27 @@
 # modifications, as long as this notice is preserved.
 
 m4_define([_LT_COPYING], [dnl
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-#                 Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-#   This file is part of GNU Libtool.
+# Copyright (C) 2014 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool 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 of of the License, or
+# (at your option) any later version.
 #
-# GNU Libtool 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 of
-# the License, or (at your option) any later version.
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program or library that is built
+# using GNU Libtool, you may include this file under the  same
+# distribution terms that you use for the rest of that program.
 #
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# GNU Libtool 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 GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ])
 
 # serial 58 LT_INIT
@@ -715,12 +709,13 @@ _LT_CONFIG_SAVE_COMMANDS([
 
     cat <<_LT_EOF >> "$cfgfile"
 #! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
 # Generated automatically by $as_me ($PACKAGE) $VERSION
 # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
+
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit, 1996
+
 _LT_COPYING
 _LT_LIBTOOL_TAGS
 


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Fri Jan 03 02:10:23 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Vyytj-0001E8-Cq
	for mharc-libtool-commit@gnu.org; Fri, 03 Jan 2014 02:10:23 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:50606)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Vyyth-0001Db-3K
	for libtool-commit@gnu.org; Fri, 03 Jan 2014 02:10:22 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Vyytf-00041i-Jd
	for libtool-commit@gnu.org; Fri, 03 Jan 2014 02:10:21 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:46416)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Vyytf-00041e-G9
	for libtool-commit@gnu.org; Fri, 03 Jan 2014 02:10:19 -0500
Received: from gary by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Vyytd-0005am-Ad
	for libtool-commit@gnu.org; Fri, 03 Jan 2014 07:10:18 +0000
Date: Fri, 03 Jan 2014 07:10:18 +0000
Message-Id: <E1Vyytd-0005am-Ad@vcs.savannah.gnu.org>
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
Subject: [SCM] GNU Libtool branch, master, updated. v2.4.2.444-14-gda59d47
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 9f8717edbcb133d0aa3fa797e56de83432acd941
X-Git-Newrev: da59d47a448f0a623c7f56632dbe8c3f864a450a
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Jan 2014 07:10:22 -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 Libtool".

The branch, master has been updated
       via  da59d47a448f0a623c7f56632dbe8c3f864a450a (commit)
       via  9ef95183f0ae64d1cdbfeb68d3ad6ce37e6e9b97 (commit)
       via  5b1d8fd0a05f2aec7f67082c9343a9a592910a2c (commit)
      from  9f8717edbcb133d0aa3fa797e56de83432acd941 (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 da59d47a448f0a623c7f56632dbe8c3f864a450a
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Fri Jan 3 20:07:48 2014 +1300

    inline-source: gawk doesn't have boolean constants.
    
    I've been writing a lot of Lua lately, but still a silly mistake:(
    * gl/build-aux/inline-source (func_include): Use `magic` variable
    to count #! lines found, and only output the DO NOT EDIT warning
    after the first one.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

commit 9ef95183f0ae64d1cdbfeb68d3ad6ce37e6e9b97
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Fri Jan 3 18:21:40 2014 +1300

    edit-readme-alpha: adjust for recent README edits.
    
    * build-aux/edit-readme-alpha: Adjust regexps for recent README
    improvements.
    * README.md: Fix a SPACE-TAB sanity check failure.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

commit 5b1d8fd0a05f2aec7f67082c9343a9a592910a2c
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Fri Jan 3 18:20:40 2014 +1300

    bootstrap: fix test-dollar sanity check failure.
    
    * gl/build-aux/bootstrap.in (func_ensure_README): quote argument.
    * bootstrap: Regenerate.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

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

Summary of changes:
 README.md                   |    2 +-
 bootstrap                   |    6 +++---
 build-aux/edit-readme-alpha |   12 ++++++------
 gl/build-aux/bootstrap.in   |    6 +++---
 gl/build-aux/inline-source  |    6 +++---
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 96898b4..5e41f2e 100644
--- a/README.md
+++ b/README.md
@@ -120,7 +120,7 @@ that further limiting of the recursive set of tests is possible.  For
 example, to run only the template tests within the `max_cmd_len`, use:
 
     gmake check TESTSUITEFLAGS="-v -x -k max_cmd_len \
-	 	INNER_TESTSUITEFLAGS=',template -v -x'"
+                INNER_TESTSUITEFLAGS=',template -v -x'"
 
 If you wish to report test failures to the libtool list, you need to
 send the file `tests/testsuite.log` to the [bug mailing list][].
diff --git a/bootstrap b/bootstrap
index 44cd0cd..e102622 100755
--- a/bootstrap
+++ b/bootstrap
@@ -3029,17 +3029,17 @@ EOT
 # Without AM_INIT_AUTOMAKE([foreign]), automake will not run to
 # completion with no README file, even though README.md or README.txt
 # is often preferable.
-func_ensure_changelog ()
+func_ensure_README ()
 {
     $debug_cmd
 
     test -f README || {
       _G_README=
       for _G_readme in README.txt README.md README.rst; do
-        test -f $_G_readme && break
+        test -f "$_G_readme" && break
       done
 
-      test -f $_G_readme && $LN_S $_G_readme README
+      test -f "$_G_readme" && $LN_S $_G_readme README
       func_verbose "$LN_S $_G_readme README"
     }
 
diff --git a/build-aux/edit-readme-alpha b/build-aux/edit-readme-alpha
index 390994a..166584c 100755
--- a/build-aux/edit-readme-alpha
+++ b/build-aux/edit-readme-alpha
@@ -64,12 +64,12 @@ for file in "$@"; do
 
   # Make sure the paragraph we are matching has not been edited since
   # this script was written.
-  matched=`sed -n -e '/^This is GNU Libtool,/,/^interface\.$/p' $file \
+  matched=`sed -n -e '/^\[GNU Libtool\]\[libtool\] is/,/^consistent, portable interface\.$/p' $file \
            |wc -l |sed 's|^ *||'`
 
   # Unless, of course, it was edited by this script already.
   test 3 = "$matched" \
-      || matched=`sed -n -e '/^This is an alpha testing release/,/behind a consistent, portable interface\.$/p' $file \
+      || matched=`sed -n -e '/^This is an alpha testing release/,/a consistent, portable interface\.$/p' $file \
                   |wc -l |sed 's|^ *||'`
 
   test 3 = "$matched" \
@@ -79,10 +79,10 @@ for file in "$@"; do
   trap 'x=$?; rm $file.T; exit $x' 1 2 13 15
 
   # Edit the first paragraph to be suitable for an alpha release.
-  sed -e '/^This is GNU Libtool,/,/^interface.$/c\
-This is an alpha testing release of GNU Libtool, a generic library\
-support script.  Libtool hides the complexity of using shared libraries\
-behind a consistent, portable interface.' $file > $file.T
+  sed -n '/^\[GNU Libtool\]\[libtool\] is/,/^consistent, portable interface\.$/c\
+This is an alpha testing release of [GNU Libtool][libtool], a generic\
+library support script.  [Libtool][] hides the complexity of using shared\
+libraries behind a consistent, portable interface.' $file > $file.T
 
   # Diagnose redirection failure.
   test -f "$file.T" || func_fatal_error "Unable to write $file.T"
diff --git a/gl/build-aux/bootstrap.in b/gl/build-aux/bootstrap.in
index d596c84..848d344 100755
--- a/gl/build-aux/bootstrap.in
+++ b/gl/build-aux/bootstrap.in
@@ -695,17 +695,17 @@ EOT
 # Without AM_INIT_AUTOMAKE([foreign]), automake will not run to
 # completion with no README file, even though README.md or README.txt
 # is often preferable.
-func_ensure_changelog ()
+func_ensure_README ()
 {
     $debug_cmd
 
     test -f README || {
       _G_README=
       for _G_readme in README.txt README.md README.rst; do
-        test -f $_G_readme && break
+        test -f "$_G_readme" && break
       done
 
-      test -f $_G_readme && $LN_S $_G_readme README
+      test -f "$_G_readme" && $LN_S $_G_readme README
       func_verbose "$LN_S $_G_readme README"
     }
 
diff --git a/gl/build-aux/inline-source b/gl/build-aux/inline-source
index 54cce33..1e4772c 100755
--- a/gl/build-aux/inline-source
+++ b/gl/build-aux/inline-source
@@ -124,13 +124,13 @@ func_include ()
     test -n "$_G_scriptdir" || _G_scriptdir="./"
 
     $AWK '
-        BEGIN { domagic = true; }
+        BEGIN { magic = 0; }
 
-        /^#!/ && domagic == true {
+        /^#!/ && magic == 0 {
             print $0;
             print "## DO NOT EDIT - This file generated from '$1'";
             print "##               by '$progname' v'$scriptversion'";
-            domagic = false;
+            magic++;
             next;
         }
 


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Fri Jan 03 17:46:29 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VzDVd-0005Pn-C5
	for mharc-libtool-commit@gnu.org; Fri, 03 Jan 2014 17:46:29 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:42979)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VzDVa-0005PW-RH
	for libtool-commit@gnu.org; Fri, 03 Jan 2014 17:46:27 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VzDVZ-0001Y3-Tk
	for libtool-commit@gnu.org; Fri, 03 Jan 2014 17:46:26 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:59765)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VzDVZ-0001Xt-Q2
	for libtool-commit@gnu.org; Fri, 03 Jan 2014 17:46:25 -0500
Received: from gary by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VzDVZ-0001oJ-Co
	for libtool-commit@gnu.org; Fri, 03 Jan 2014 22:46:25 +0000
Date: Fri, 03 Jan 2014 22:46:25 +0000
Message-Id: <E1VzDVZ-0001oJ-Co@vcs.savannah.gnu.org>
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
Subject: [SCM] GNU Libtool branch, master, updated. v2.4.2.444-15-gb1a09df
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: da59d47a448f0a623c7f56632dbe8c3f864a450a
X-Git-Newrev: b1a09dfa0d7ed7ca32139556d5fc815e73a7b274
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Jan 2014 22:46:27 -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 Libtool".

The branch, master has been updated
       via  b1a09dfa0d7ed7ca32139556d5fc815e73a7b274 (commit)
      from  da59d47a448f0a623c7f56632dbe8c3f864a450a (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 b1a09dfa0d7ed7ca32139556d5fc815e73a7b274
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Sat Jan 4 11:43:58 2014 +1300

    inline-source: DO NOT EDIT warning only for top-level file.
    
    * gl/build-aux/inline-source (func_include): When recursing, pass
    through the value of `magic` so that only the very first #! magic
    number has a DO NOT EDIT warning injected.
    * bootstrap: Regenerate.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

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

Summary of changes:
 bootstrap                  |    4 ----
 gl/build-aux/inline-source |    6 +++---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/bootstrap b/bootstrap
index e102622..86ff9f7 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1533,8 +1533,6 @@ func_lt_ver ()
 # time-stamp-time-zone: "UTC"
 # End:
 #! /bin/sh
-## DO NOT EDIT - This file generated from build-aux/options-parser
-##               by inline-source v2014-01-03.01
 
 # Set a version string for this script.
 scriptversion=2014-01-03.01; # UTC
@@ -2143,8 +2141,6 @@ func_version ()
 # time-stamp-time-zone: "UTC"
 # End:
 #! /bin/sh
-## DO NOT EDIT - This file generated from build-aux/extract-trace
-##               by inline-source v2014-01-03.01
 
 # Extract macro arguments from autotools input with GNU M4.
 # Written by Gary V. Vaughan, 2010
diff --git a/gl/build-aux/inline-source b/gl/build-aux/inline-source
index 1e4772c..fede037 100755
--- a/gl/build-aux/inline-source
+++ b/gl/build-aux/inline-source
@@ -124,7 +124,7 @@ func_include ()
     test -n "$_G_scriptdir" || _G_scriptdir="./"
 
     $AWK '
-        BEGIN { magic = 0; }
+        BEGIN { magic = '${_RECURSE_MAGIC-0}'; }
 
         /^#!/ && magic == 0 {
             print $0;
@@ -136,14 +136,14 @@ func_include ()
 
         /^\. ['\''"].*['\''"]$/ {
             file = substr ($2, 2, length ($2) -2);
-	    system (sprintf ("'$progpath' %s", file));
+	    system (sprintf ("env _RECURSE_MAGIC=%d '$progpath' %s", magic, file));
             next;
         }
 
         /^\. `echo [^`]*`['\''"][^'\''"]*['\''"]$/ {
             tail = substr ($0, match ($0, /`['\''"]/));
 	    file = substr (tail, 3, length (tail) -3);
-	    system (sprintf ("'$progpath' '"$_G_scriptdir"'%s", file));
+	    system (sprintf ("env _RECURSE_MAGIC=%d '$progpath' '"$_G_scriptdir"'%s", magic, file));
             next;
         }
 


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Fri Jan 03 20:55:14 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VzGSI-0005M9-1n
	for mharc-libtool-commit@gnu.org; Fri, 03 Jan 2014 20:55:14 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:43861)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VzGSF-0005Li-DQ
	for libtool-commit@gnu.org; Fri, 03 Jan 2014 20:55:12 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VzGSE-000859-0F
	for libtool-commit@gnu.org; Fri, 03 Jan 2014 20:55:11 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:33636)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VzGSD-000854-Ss
	for libtool-commit@gnu.org; Fri, 03 Jan 2014 20:55:09 -0500
Received: from gary by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VzGSB-0007gp-NF
	for libtool-commit@gnu.org; Sat, 04 Jan 2014 01:55:08 +0000
Date: Sat, 04 Jan 2014 01:55:07 +0000
Message-Id: <E1VzGSB-0007gp-NF@vcs.savannah.gnu.org>
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
Subject: [SCM] GNU Libtool branch, master, updated. v2.4.2.444-16-gb40922a
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: b1a09dfa0d7ed7ca32139556d5fc815e73a7b274
X-Git-Newrev: b40922af00e13b7ab30d3dff6c63a7c9f6aece5d
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 04 Jan 2014 01:55:12 -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 Libtool".

The branch, master has been updated
       via  b40922af00e13b7ab30d3dff6c63a7c9f6aece5d (commit)
      from  b1a09dfa0d7ed7ca32139556d5fc815e73a7b274 (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 b40922af00e13b7ab30d3dff6c63a7c9f6aece5d
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Sat Jan 4 14:53:06 2014 +1300

    bootstrap: replace spurious hyphen in some section comments.
    
    * gl/build-aux/bootstrap.in: replace spurious hypen in same
    section header comments with a space.
    * gl/build-aux/extract-trace, gl/build-aux/options-parser:
    Likewise.
    * bootstrap: Regenerate.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

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

Summary of changes:
 bootstrap                   |   20 ++++++++++----------
 gl/build-aux/bootstrap.in   |    6 +++---
 gl/build-aux/extract-trace  |    8 ++++----
 gl/build-aux/options-parser |    6 +++---
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/bootstrap b/bootstrap
index 86ff9f7..8b1b76c 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1535,7 +1535,7 @@ func_lt_ver ()
 #! /bin/sh
 
 # Set a version string for this script.
-scriptversion=2014-01-03.01; # UTC
+scriptversion=2014-01-04.01; # UTC
 
 # A portable, pluggable option parser for Bourne shell.
 # Written by Gary V. Vaughan, 2010
@@ -1957,9 +1957,9 @@ func_validate_options ()
 
 
 
-## ------------------##
+## ----------------- ##
 ## Helper functions. ##
-## ------------------##
+## ----------------- ##
 
 # This section contains the helper functions used by the rest of the
 # hookable option parser framework in ascii-betical order.
@@ -2154,7 +2154,7 @@ test -z "$progpath" && . `echo "$0" |${SED-sed} 's|[^/]*$||'`/funclib.sh
 test extract-trace = "$progname" && . `echo "$0" |${SED-sed} 's|[^/]*$||'`/options-parser
 
 # Set a version string.
-scriptversion=2013-08-22.10; # UTC
+scriptversion=2014-01-04.01; # UTC
 
 # 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
@@ -2186,9 +2186,9 @@ scriptversion=2013-08-22.10; # UTC
 
 
 
-## ------------------##
+## ----------------- ##
 ## Helper functions. ##
-## ------------------##
+## ----------------- ##
 
 # This section contains the helper functions used by the rest of
 # 'extract-trace'.
@@ -2557,12 +2557,12 @@ test extract-trace = "$progname" && func_main "$@"
 # mode: shell-script
 # sh-indentation: 2
 # eval: (add-hook 'before-save-hook 'time-stamp)
-# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+# time-stamp-pattern: "20/scriptversion=%:y-%02m-%02d.%02H; # UTC"
 # time-stamp-time-zone: "UTC"
 # End:
 
 # Set a version string for *this* script.
-scriptversion=2014-01-03.01; # UTC
+scriptversion=2014-01-04.01; # UTC
 
 
 ## ------------------- ##
@@ -4314,9 +4314,9 @@ func_require_vc_ignore_files ()
 }
 
 
-## ------------------##
+## ----------------- ##
 ## Helper functions. ##
-## ------------------##
+## ----------------- ##
 
 # This section contains the helper functions used by the rest of 'bootstrap'.
 
diff --git a/gl/build-aux/bootstrap.in b/gl/build-aux/bootstrap.in
index 848d344..7fc0c12 100755
--- a/gl/build-aux/bootstrap.in
+++ b/gl/build-aux/bootstrap.in
@@ -232,7 +232,7 @@ vc_ignore=
 . `echo "$0" |${SED-sed} 's|[^/]*$||'`"extract-trace"
 
 # Set a version string for *this* script.
-scriptversion=2014-01-03.01; # UTC
+scriptversion=2014-01-04.01; # UTC
 
 
 ## ------------------- ##
@@ -1984,9 +1984,9 @@ func_require_vc_ignore_files ()
 }
 
 
-## ------------------##
+## ----------------- ##
 ## Helper functions. ##
-## ------------------##
+## ----------------- ##
 
 # This section contains the helper functions used by the rest of 'bootstrap'.
 
diff --git a/gl/build-aux/extract-trace b/gl/build-aux/extract-trace
index e18ed90..41a7b8b 100755
--- a/gl/build-aux/extract-trace
+++ b/gl/build-aux/extract-trace
@@ -12,7 +12,7 @@ test -z "$progpath" && . `echo "$0" |${SED-sed} 's|[^/]*$||'`/funclib.sh
 test extract-trace = "$progname" && . `echo "$0" |${SED-sed} 's|[^/]*$||'`/options-parser
 
 # Set a version string.
-scriptversion=2013-08-22.10; # UTC
+scriptversion=2014-01-04.01; # UTC
 
 # 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
@@ -44,9 +44,9 @@ scriptversion=2013-08-22.10; # UTC
 
 
 
-## ------------------##
+## ----------------- ##
 ## Helper functions. ##
-## ------------------##
+## ----------------- ##
 
 # This section contains the helper functions used by the rest of
 # 'extract-trace'.
@@ -415,6 +415,6 @@ test extract-trace = "$progname" && func_main "$@"
 # mode: shell-script
 # sh-indentation: 2
 # eval: (add-hook 'before-save-hook 'time-stamp)
-# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+# time-stamp-pattern: "20/scriptversion=%:y-%02m-%02d.%02H; # UTC"
 # time-stamp-time-zone: "UTC"
 # End:
diff --git a/gl/build-aux/options-parser b/gl/build-aux/options-parser
index 4c18aab..25a25eb 100644
--- a/gl/build-aux/options-parser
+++ b/gl/build-aux/options-parser
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # Set a version string for this script.
-scriptversion=2014-01-03.01; # UTC
+scriptversion=2014-01-04.01; # UTC
 
 # A portable, pluggable option parser for Bourne shell.
 # Written by Gary V. Vaughan, 2010
@@ -423,9 +423,9 @@ func_validate_options ()
 
 
 
-## ------------------##
+## ----------------- ##
 ## Helper functions. ##
-## ------------------##
+## ----------------- ##
 
 # This section contains the helper functions used by the rest of the
 # hookable option parser framework in ascii-betical order.


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Sat Jan 04 23:16:54 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Vzf8w-0005o1-Qd
	for mharc-libtool-commit@gnu.org; Sat, 04 Jan 2014 23:16:54 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:47506)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Vzf8u-0005nA-B4
	for libtool-commit@gnu.org; Sat, 04 Jan 2014 23:16:53 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Vzf8t-0001bB-2n
	for libtool-commit@gnu.org; Sat, 04 Jan 2014 23:16:52 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:51810)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Vzf8s-0001b7-W5
	for libtool-commit@gnu.org; Sat, 04 Jan 2014 23:16:51 -0500
Received: from gary by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Vzf8s-0000Wp-KR
	for libtool-commit@gnu.org; Sun, 05 Jan 2014 04:16:50 +0000
Date: Sun, 05 Jan 2014 04:16:50 +0000
Message-Id: <E1Vzf8s-0000Wp-KR@vcs.savannah.gnu.org>
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
Subject: [SCM] GNU Libtool branch, master, updated. v2.4.2.444-17-g1f14273
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: b40922af00e13b7ab30d3dff6c63a7c9f6aece5d
X-Git-Newrev: 1f14273e954361bde44143458098acd9723e54a2
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Jan 2014 04:16:53 -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 Libtool".

The branch, master has been updated
       via  1f14273e954361bde44143458098acd9723e54a2 (commit)
      from  b40922af00e13b7ab30d3dff6c63a7c9f6aece5d (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 1f14273e954361bde44143458098acd9723e54a2
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Sun Jan 5 17:13:47 2014 +1300

    bootstrap: remove conftest.sed file droppings.
    
    * gl/build-aux/funclib.sh: Remove conftest.sed when no longer
    needed.
    * bootstrap: Regenerate.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

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

Summary of changes:
 bootstrap               |    1 +
 gl/build-aux/funclib.sh |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/bootstrap b/bootstrap
index 8b1b76c..b5b6730 100755
--- a/bootstrap
+++ b/bootstrap
@@ -426,6 +426,7 @@ test -z "$SED" && {
   }
 
   func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin
+  rm -f conftest.sed
   SED=$func_path_progs_result
 }
 
diff --git a/gl/build-aux/funclib.sh b/gl/build-aux/funclib.sh
index 981941d..9cb02ff 100644
--- a/gl/build-aux/funclib.sh
+++ b/gl/build-aux/funclib.sh
@@ -195,6 +195,7 @@ test -z "$SED" && {
   }
 
   func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin
+  rm -f conftest.sed
   SED=$func_path_progs_result
 }
 


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Mon Jan 06 21:38:18 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1W0MYc-000221-Eo
	for mharc-libtool-commit@gnu.org; Mon, 06 Jan 2014 21:38:18 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:44405)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1W0MYS-00020p-Ky
	for libtool-commit@gnu.org; Mon, 06 Jan 2014 21:38:10 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1W0MYR-0000Vt-7V
	for libtool-commit@gnu.org; Mon, 06 Jan 2014 21:38:08 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:33275)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1W0MYR-0000Vo-46
	for libtool-commit@gnu.org; Mon, 06 Jan 2014 21:38:07 -0500
Received: from gary by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1W0MYQ-0006tH-Hv
	for libtool-commit@gnu.org; Tue, 07 Jan 2014 02:38:06 +0000
Date: Tue, 07 Jan 2014 02:38:06 +0000
Message-Id: <E1W0MYQ-0006tH-Hv@vcs.savannah.gnu.org>
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
Subject: [SCM] GNU Libtool branch, master, updated. v2.4.2.444-18-g5e5cf7a
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 1f14273e954361bde44143458098acd9723e54a2
X-Git-Newrev: 5e5cf7a7d67a1af4752bf442a42a5a77dccacd3e
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Jan 2014 02:38:14 -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 Libtool".

The branch, master has been updated
       via  5e5cf7a7d67a1af4752bf442a42a5a77dccacd3e (commit)
      from  1f14273e954361bde44143458098acd9723e54a2 (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 5e5cf7a7d67a1af4752bf442a42a5a77dccacd3e
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Tue Jan 7 14:16:34 2014 +1300

    bootstrap: specify particular version in buildreq with =x.y.
    
    * gl/build-aux/bootstrap.in (func_check_versions): If the version
    number begins with '=' then it must match the installed version of
    the named tool exactly.
    * gl/doc/bootstrap.texi (buildreq): Document the '=vernum' feature.
    * bootstrap: Regenerate.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

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

Summary of changes:
 bootstrap                 |   26 ++++++++++++++++++++------
 gl/build-aux/bootstrap.in |   26 ++++++++++++++++++++------
 gl/doc/bootstrap.texi     |    5 +++++
 3 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/bootstrap b/bootstrap
index b5b6730..4ca10e4 100755
--- a/bootstrap
+++ b/bootstrap
@@ -4805,9 +4805,6 @@ delimited list of triples; 'program min-version url'."
       else
         _G_instver=`func_get_version $_G_app`
 
-        test -z "$_G_instver" \
-            || func_verbose "found '$_G_app' version $_G_instver."
-
         # Fail if --version didn't work.
         if test -z "$_G_instver"; then
           func_error "Prerequisite '$_G_app' not found. Please install it, or
@@ -4816,12 +4813,29 @@ delimited list of triples; 'program min-version url'."
 
         # Fail if a newer version than what we have is required.
         else
-          func_lt_ver "$_G_reqver" "$_G_instver" || {
-            func_error "\
+          func_verbose "found '$_G_app' version $_G_instver."
+
+	  case $_G_reqver in
+            =*)
+              # If $buildreq version starts with '=', version must
+	      # match the installed program exactly.
+	      test "x$_G_reqver" = "x=$_G_instver" || {
+	        func_error "\
+  '$_G_app' version == $_G_instver is too old
+  'exactly $_G_app-$_G_reqver is required"
+                func_check_versions_result=false
+              }
+	      ;;
+	    *)
+              # Otherwise, anything that is not older is a match.
+              func_lt_ver "$_G_reqver" "$_G_instver" || {
+                func_error "\
   '$_G_app' version == $_G_instver is too old
   '$_G_app' version >= $_G_reqver is required"
             func_check_versions_result=false
-          }
+              }
+	      ;;
+	  esac
         fi
       fi
     done
diff --git a/gl/build-aux/bootstrap.in b/gl/build-aux/bootstrap.in
index 7fc0c12..71ff3ae 100755
--- a/gl/build-aux/bootstrap.in
+++ b/gl/build-aux/bootstrap.in
@@ -2474,9 +2474,6 @@ delimited list of triples; 'program min-version url'."
       else
         _G_instver=`func_get_version $_G_app`
 
-        test -z "$_G_instver" \
-            || func_verbose "found '$_G_app' version $_G_instver."
-
         # Fail if --version didn't work.
         if test -z "$_G_instver"; then
           func_error "Prerequisite '$_G_app' not found. Please install it, or
@@ -2485,12 +2482,29 @@ delimited list of triples; 'program min-version url'."
 
         # Fail if a newer version than what we have is required.
         else
-          func_lt_ver "$_G_reqver" "$_G_instver" || {
-            func_error "\
+          func_verbose "found '$_G_app' version $_G_instver."
+
+	  case $_G_reqver in
+            =*)
+              # If $buildreq version starts with '=', version must
+	      # match the installed program exactly.
+	      test "x$_G_reqver" = "x=$_G_instver" || {
+	        func_error "\
+  '$_G_app' version == $_G_instver is too old
+  'exactly $_G_app-$_G_reqver is required"
+                func_check_versions_result=false
+              }
+	      ;;
+	    *)
+              # Otherwise, anything that is not older is a match.
+              func_lt_ver "$_G_reqver" "$_G_instver" || {
+                func_error "\
   '$_G_app' version == $_G_instver is too old
   '$_G_app' version >= $_G_reqver is required"
             func_check_versions_result=false
-          }
+              }
+	      ;;
+	  esac
         fi
       fi
     done
diff --git a/gl/doc/bootstrap.texi b/gl/doc/bootstrap.texi
index a457931..2f7b382 100755
--- a/gl/doc/bootstrap.texi
+++ b/gl/doc/bootstrap.texi
@@ -82,6 +82,11 @@ requirement for Autobuild is added automatically, and finally if there
 are any diff files under @code{local_gl_dir}, then a versionless
 requirement for patch is also added.
 
+When there are backwards incompatibilities in a newer build-tool
+release, you can pin the version requirement for your program by
+prefixing the version number field in buildreq with a single '='
+character (no spaces).
+
 When @command{bootstrap} is invoked, it will check that all the listed
 and automatically added tools are available at the given minimum version,
 or else bail out with a diagnostic.


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Mon Jan 06 22:08:26 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1W0N1m-0007Jv-2y
	for mharc-libtool-commit@gnu.org; Mon, 06 Jan 2014 22:08:26 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:47605)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1W0N1j-0007Jn-4Q
	for libtool-commit@gnu.org; Mon, 06 Jan 2014 22:08:23 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1W0N1i-0007jv-3j
	for libtool-commit@gnu.org; Mon, 06 Jan 2014 22:08:23 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:33631)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1W0N1i-0007jp-0f
	for libtool-commit@gnu.org; Mon, 06 Jan 2014 22:08:22 -0500
Received: from gary by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1W0N1g-0000Xl-KO
	for libtool-commit@gnu.org; Tue, 07 Jan 2014 03:08:21 +0000
Date: Tue, 07 Jan 2014 03:08:20 +0000
Message-Id: <E1W0N1g-0000Xl-KO@vcs.savannah.gnu.org>
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
Subject: [SCM] GNU Libtool branch, master, updated. v2.4.2.444-19-g7547214
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 5e5cf7a7d67a1af4752bf442a42a5a77dccacd3e
X-Git-Newrev: 754721442a645b599113f53bae5ed76d804de5bd
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Jan 2014 03:08:24 -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 Libtool".

The branch, master has been updated
       via  754721442a645b599113f53bae5ed76d804de5bd (commit)
      from  5e5cf7a7d67a1af4752bf442a42a5a77dccacd3e (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 754721442a645b599113f53bae5ed76d804de5bd
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Tue Jan 7 16:06:02 2014 +1300

    options-parser: --version works with 'DO NOT EDIT' preamble again.
    
    * gl/build-aux/options-parser (func_version): Don't quit on first
    leading '##' line, otherwise DO NOT edit warnings prevent version
    information from being extracted correctly.
    * bootstrap: Regenerate.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

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

Summary of changes:
 bootstrap                   |    4 ++--
 gl/build-aux/options-parser |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bootstrap b/bootstrap
index 4ca10e4..db31255 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1536,7 +1536,7 @@ func_lt_ver ()
 #! /bin/sh
 
 # Set a version string for this script.
-scriptversion=2014-01-04.01; # UTC
+scriptversion=2014-01-07.03; # UTC
 
 # A portable, pluggable option parser for Bourne shell.
 # Written by Gary V. Vaughan, 2010
@@ -2109,7 +2109,7 @@ func_version ()
     $debug_cmd
 
     printf '%s\n' "$progname $scriptversion"
-    $SED -n '/^##/q
+    $SED -n '
         /(C)/!b go
         :more
         /\./!{
diff --git a/gl/build-aux/options-parser b/gl/build-aux/options-parser
index 25a25eb..41302a8 100644
--- a/gl/build-aux/options-parser
+++ b/gl/build-aux/options-parser
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # Set a version string for this script.
-scriptversion=2014-01-04.01; # UTC
+scriptversion=2014-01-07.03; # UTC
 
 # A portable, pluggable option parser for Bourne shell.
 # Written by Gary V. Vaughan, 2010
@@ -574,7 +574,7 @@ func_version ()
     $debug_cmd
 
     printf '%s\n' "$progname $scriptversion"
-    $SED -n '/^##/q
+    $SED -n '
         /(C)/!b go
         :more
         /\./!{


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Fri Jan 10 19:30:12 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1W1mSq-0000Rf-AY
	for mharc-libtool-commit@gnu.org; Fri, 10 Jan 2014 19:30:12 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:51851)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1W1mSn-0000RF-FX
	for libtool-commit@gnu.org; Fri, 10 Jan 2014 19:30:10 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1W1mSl-0001dT-GH
	for libtool-commit@gnu.org; Fri, 10 Jan 2014 19:30:09 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:59044)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1W1mSl-0001cz-E4
	for libtool-commit@gnu.org; Fri, 10 Jan 2014 19:30:07 -0500
Received: from gary by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1W1mSj-000196-93
	for libtool-commit@gnu.org; Sat, 11 Jan 2014 00:30:05 +0000
Date: Sat, 11 Jan 2014 00:30:05 +0000
Message-Id: <E1W1mSj-000196-93@vcs.savannah.gnu.org>
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
Subject: [SCM] GNU Libtool branch, master, updated. v2.4.2.444-20-g2f75576
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 754721442a645b599113f53bae5ed76d804de5bd
X-Git-Newrev: 2f75576d051fad9a8c0b274c5be1289d57c0b636
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 11 Jan 2014 00:30:10 -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 Libtool".

The branch, master has been updated
       via  2f75576d051fad9a8c0b274c5be1289d57c0b636 (commit)
      from  754721442a645b599113f53bae5ed76d804de5bd (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 2f75576d051fad9a8c0b274c5be1289d57c0b636
Author: Todd C. Miller <Todd.Miller@courtesan.com>
Date:   Sat Jan 11 13:15:32 2014 +1300

    libtoolize: don't remove install-sh.
    
    If you are not using automake, libtoolize would remove install-sh.
    It needs the same treatment as config.guess and config.sub.
    * libtoolize.in (func_require_seen_libtool): Remove install-sh
    from $all_pkgaux_files, the list of files removed by
    `libtoolize --force`.
    * THANKS: Add Todd C. Miller.
    * NEWS: Update.
    
    Copyright-paperwork-exempt: Yes
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

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

Summary of changes:
 NEWS          |    3 +++
 THANKS        |    1 +
 libtoolize.in |    7 ++++---
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index c8730c7..1ca6d65 100644
--- a/NEWS
+++ b/NEWS
@@ -69,6 +69,9 @@ NEWS - list of user-visible changes between releases of GNU Libtool
   - Recognize more variants (e.g. those starting with a LIBRARY statement)
     of module-definitions (.def) files when using them instead of a raw
     list of symbols to export.
+  - Fix a long-standing bug when using libtoolize without automake; we
+    no longer remove install-sh with --force, since it's not a file
+    libtoolize will reinstall without --install..
 
 ** Important incompatible changes:
 
diff --git a/THANKS b/THANKS
index b59bed2..de0cfde 100644
--- a/THANKS
+++ b/THANKS
@@ -194,6 +194,7 @@
   Sven Verdoolaege		skimo@liacs.nl
   Terry D. Dontje		Terry.Dontje@Sun.COM
   Tim Mooney			mooney@dogbert.cc.ndsu.NoDak.edu
+  Todd C. Miller		Todd.Miller@courtesan.com
   Todd Vierling			tv@pobox.com
   Tom Tromey			tromey@cygnus.com
   Tor Lillqvist			tml@iki.fi
diff --git a/libtoolize.in b/libtoolize.in
index 1842465..d819470 100644
--- a/libtoolize.in
+++ b/libtoolize.in
@@ -1894,9 +1894,10 @@ func_require_seen_libtool ()
   # Lists of all files libtoolize has ever installed.  These are removed
   # before installing the latest files when --force was passed to help
   # ensure a clean upgrade.
-  # Do not remove config.guess nor config.sub, we don't install them
-  # without --install, and the project may not be using Automake.
-  all_pkgaux_files="compile install-sh depcomp missing ltmain.sh snippet/_Noreturn.h snippet/arg-nonnull.h snippet/c++defs.h snippet/warn-on-use.h"
+  # Do not remove config.guess, config.sub or install-sh, we don't
+  # install them without --install, and the project may not be using
+  # Automake.
+  all_pkgaux_files="compile depcomp missing ltmain.sh snippet/_Noreturn.h snippet/arg-nonnull.h snippet/c++defs.h snippet/warn-on-use.h"
   all_pkgmacro_files="argz.m4 libtool.m4 ltdl.m4 ltoptions.m4 ltsugar.m4 ltversion.in ltversion.m4 lt~obsolete.m4"
   all_pkgltdl_files="COPYING.LIB Makefile Makefile.in Makefile.inc Makefile.am README acinclude.m4 aclocal.m4 argz_.h argz.c config.h.in config-h.in configure configure.ac configure.in libltdl/lt__alloc.h libltdl/lt__dirent.h libltdl/lt__glibc.h libltdl/lt__private.h libltdl/lt__strl.h libltdl/lt_dlloader.h libltdl/lt_error.h libltdl/lt_system.h libltdl/slist.h loaders/dld_link.c loaders/dlopen.c loaders/dyld.c loaders/load_add_on.c loaders/loadlibrary.c loaders/preopen.c loaders/shl_load.c lt__alloc.c lt__dirent.c lt__strl.c lt_dlloader.c lt_error.c ltdl.c ltdl.h ltdl.mk slist.c"
 


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Fri Jan 17 16:14:36 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1W4GkO-0006Ij-47
	for mharc-libtool-commit@gnu.org; Fri, 17 Jan 2014 16:14:36 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:49863)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1W4GkM-0006Fm-0Z
	for libtool-commit@gnu.org; Fri, 17 Jan 2014 16:14:35 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1W4GkK-0002To-Pj
	for libtool-commit@gnu.org; Fri, 17 Jan 2014 16:14:33 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:55472)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1W4GkK-0002Tk-Mg
	for libtool-commit@gnu.org; Fri, 17 Jan 2014 16:14:32 -0500
Received: from gary by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1W4GkK-0006KO-3N
	for libtool-commit@gnu.org; Fri, 17 Jan 2014 21:14:32 +0000
Date: Fri, 17 Jan 2014 21:14:32 +0000
Message-Id: <E1W4GkK-0006KO-3N@vcs.savannah.gnu.org>
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
Subject: [SCM] GNU Libtool branch, master, updated. v2.4.2.444-22-g525cddd
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 2f75576d051fad9a8c0b274c5be1289d57c0b636
X-Git-Newrev: 525cddd2bcea4c565d6dd1d2d55dd1de1a476b67
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 17 Jan 2014 21:14:35 -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 Libtool".

The branch, master has been updated
       via  525cddd2bcea4c565d6dd1d2d55dd1de1a476b67 (commit)
       via  64367d3499ec323af2e18326996c8c73924eab50 (commit)
      from  2f75576d051fad9a8c0b274c5be1289d57c0b636 (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 525cddd2bcea4c565d6dd1d2d55dd1de1a476b67
Author: Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
Date:   Sat Jan 18 10:07:52 2014 +1300

    libtool: opt_duplicate_compiler_generated_deps is harmful on Solaris
    
    Fix for http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452.
    * build-aux/ltmain.in (libtool_validate_options): disable the
    opt_duplicate_compiler_generated_deps optimization for Solaris2 so
    that gcc-4.9+ compiled C++ code with -Wl,-Bdirect on 64-bit Solaris
    x86 can avoid unwinding failures caused by accidental mixing of the
    libc and libgcc_s unwinders in a single executable.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

commit 64367d3499ec323af2e18326996c8c73924eab50
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Wed Jan 15 20:10:29 2014 +1300

    bootstrap: check for git checkout correctly.
    
    * gl/bulid-aux/bootstrap.in (func_require_git): Use .git instead
    of .gitignore to recognise a git checkout.
    * bootstrap: Regenerate.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

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

Summary of changes:
 bootstrap                 |    4 ++--
 build-aux/ltmain.in       |    4 +++-
 gl/build-aux/bootstrap.in |    4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/bootstrap b/bootstrap
index db31255..2094e73 100755
--- a/bootstrap
+++ b/bootstrap
@@ -3698,8 +3698,8 @@ func_require_git ()
     $opt_skip_git && GIT=true
 
     test true = "$GIT" || {
-      if test -f .gitignore && ($GIT --version) >/dev/null 2>&1; then :; else
-      GIT=true
+      if test -f .git; then
+        ($GIT --version) >/dev/null 2>&1 || GIT=true
       fi
     }
 
diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
index f452e54..3b4e6ec 100644
--- a/build-aux/ltmain.in
+++ b/build-aux/ltmain.in
@@ -497,7 +497,9 @@ libtool_validate_options ()
     test : = "$debug_cmd" || func_append preserve_args " --debug"
 
     case $host in
-      *cygwin* | *mingw* | *pw32* | *cegcc*)
+      # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452
+      # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
+      *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2*)
         # don't eliminate duplications in $postdeps and $predeps
         opt_duplicate_compiler_generated_deps=:
         ;;
diff --git a/gl/build-aux/bootstrap.in b/gl/build-aux/bootstrap.in
index 71ff3ae..8441bdc 100755
--- a/gl/build-aux/bootstrap.in
+++ b/gl/build-aux/bootstrap.in
@@ -1367,8 +1367,8 @@ func_require_git ()
     $opt_skip_git && GIT=true
 
     test true = "$GIT" || {
-      if test -f .gitignore && ($GIT --version) >/dev/null 2>&1; then :; else
-      GIT=true
+      if test -f .git; then
+        ($GIT --version) >/dev/null 2>&1 || GIT=true
       fi
     }
 


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Sun Jan 26 21:12:13 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1W7bgL-0005Uy-Le
	for mharc-libtool-commit@gnu.org; Sun, 26 Jan 2014 21:12:13 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:45935)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1W7bgK-0005UX-41
	for libtool-commit@gnu.org; Sun, 26 Jan 2014 21:12:13 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1W7bgI-0008KA-PU
	for libtool-commit@gnu.org; Sun, 26 Jan 2014 21:12:12 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:45121)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1W7bgI-0008K6-Lm
	for libtool-commit@gnu.org; Sun, 26 Jan 2014 21:12:10 -0500
Received: from gary by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1W7bgH-0000P6-MN
	for libtool-commit@gnu.org; Mon, 27 Jan 2014 02:12:10 +0000
Date: Mon, 27 Jan 2014 02:12:09 +0000
Message-Id: <E1W7bgH-0000P6-MN@vcs.savannah.gnu.org>
From: "Gary V. Vaughan" <gary@gnu.org>
To: libtool-commit@gnu.org
Subject: [SCM] GNU Libtool branch, master, updated. v2.4.2.444-23-g70ff0e0
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 525cddd2bcea4c565d6dd1d2d55dd1de1a476b67
X-Git-Newrev: 70ff0e04c9dda19b74c88005abed3c1ca4adc3fc
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Jan 2014 02:12:13 -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 Libtool".

The branch, master has been updated
       via  70ff0e04c9dda19b74c88005abed3c1ca4adc3fc (commit)
      from  525cddd2bcea4c565d6dd1d2d55dd1de1a476b67 (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 70ff0e04c9dda19b74c88005abed3c1ca4adc3fc
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Mon Jan 27 15:04:53 2014 +1300

    bootstrap: use `-d .git` to check whether we are in a git tree.
    
    * gl/build-aux/bootstrap.in (func_require_git): .git is not a
    regular file, use -d to check its existence.
    * bootstrap: Regenerate.
    * THANKS: Add Bruce Korb.
    Reported by Bruce Korb
    
    Copyright-paperwork-exempt: Yes
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

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

Summary of changes:
 THANKS                    |    1 +
 bootstrap                 |    4 ++--
 gl/build-aux/bootstrap.in |    4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/THANKS b/THANKS
index de0cfde..63d3ea2 100644
--- a/THANKS
+++ b/THANKS
@@ -78,6 +78,7 @@
   Brad Smith			brad@comstyle.com
   Brent Leback			brent.leback@st.com
   Brian Barrett			brbarret@osl.iu.edu
+  Bruce Korb			bruce.korb@gmail.com
   Bruno Haible			haible@ilog.fr
   Brice De Bruyne		bricedb@gmail.com
   Camilo La Rota		camilo.larota@ens-lyon.fr
diff --git a/bootstrap b/bootstrap
index 2094e73..4e24dbf 100755
--- a/bootstrap
+++ b/bootstrap
@@ -2563,7 +2563,7 @@ test extract-trace = "$progname" && func_main "$@"
 # End:
 
 # Set a version string for *this* script.
-scriptversion=2014-01-04.01; # UTC
+scriptversion=2014-01-27.02; # UTC
 
 
 ## ------------------- ##
@@ -3698,7 +3698,7 @@ func_require_git ()
     $opt_skip_git && GIT=true
 
     test true = "$GIT" || {
-      if test -f .git; then
+      if test -d .git; then
         ($GIT --version) >/dev/null 2>&1 || GIT=true
       fi
     }
diff --git a/gl/build-aux/bootstrap.in b/gl/build-aux/bootstrap.in
index 8441bdc..d0276f6 100755
--- a/gl/build-aux/bootstrap.in
+++ b/gl/build-aux/bootstrap.in
@@ -232,7 +232,7 @@ vc_ignore=
 . `echo "$0" |${SED-sed} 's|[^/]*$||'`"extract-trace"
 
 # Set a version string for *this* script.
-scriptversion=2014-01-04.01; # UTC
+scriptversion=2014-01-27.02; # UTC
 
 
 ## ------------------- ##
@@ -1367,7 +1367,7 @@ func_require_git ()
     $opt_skip_git && GIT=true
 
     test true = "$GIT" || {
-      if test -f .git; then
+      if test -d .git; then
         ($GIT --version) >/dev/null 2>&1 || GIT=true
       fi
     }


hooks/post-receive
-- 
GNU Libtool


