From MAILER-DAEMON Thu Dec 08 00:35:21 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RYWdd-0008IE-L2
	for mharc-libtool-commit@gnu.org; Thu, 08 Dec 2011 00:35:21 -0500
Received: from eggs.gnu.org ([140.186.70.92]:55538)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RYWdX-0008HE-MC
	for libtool-commit@gnu.org; Thu, 08 Dec 2011 00:35:19 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RYWdT-0003VT-Fb
	for libtool-commit@gnu.org; Thu, 08 Dec 2011 00:35:15 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:60674)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RYWdT-0003VM-Cp
	for libtool-commit@gnu.org; Thu, 08 Dec 2011 00:35:11 -0500
Received: from gary by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RYWdS-0003sm-Jf
	for libtool-commit@gnu.org; Thu, 08 Dec 2011 05:35:10 +0000
Date: Thu, 08 Dec 2011 05:35:10 +0000
Message-Id: <E1RYWdS-0003sm-Jf@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-128-gaead37d
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 11869b9c9eb8bcc8cb6a615141f522a447377324
X-Git-Newrev: aead37d19ed17f1391f373c9599477e0e178cf0c
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
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, 08 Dec 2011 05:35:19 -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  aead37d19ed17f1391f373c9599477e0e178cf0c (commit)
       via  daf3f3a7d7ed77c9a15ddf41c744d9e509aa3945 (commit)
       via  5229af9cefbce37d9a83f89fac92de22adde57c7 (commit)
       via  44313522fcb32a47d5e61d97b6eaa6052daae516 (commit)
       via  509907a28ecbb385ff144999d72c34d0503ca430 (commit)
      from  11869b9c9eb8bcc8cb6a615141f522a447377324 (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 aead37d19ed17f1391f373c9599477e0e178cf0c
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Thu Dec 8 12:24:00 2011 +0700

    bootstrap: escape quotes properly in generated functions.
    
    * bootstrap: Although not a real bug, for consistency, be sure
    to correctly escape single quotes inside a single quoted
    function generator.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

commit daf3f3a7d7ed77c9a15ddf41c744d9e509aa3945
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Thu Dec 8 12:20:47 2011 +0700

    bootstrap: reorder function definitions to keep func_buildreq_* together.
    
    * bootstrap: Restore asciibetical order, so that all the
    buildreq function definitions are together.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

commit 5229af9cefbce37d9a83f89fac92de22adde57c7
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Thu Dec 8 12:15:11 2011 +0700

    bootstrap: use _buildreq as a prefix for better ordering.
    
    * bootstrap (require_autobuild_buildreq)
    (require_autoconf_buildreq, require_automake_buildreq)
    (require_autopoint_buildreq, require_libtoolize_buildreq)
    (require_patch_buildreq): Rename from these...
    (require_buildreq_autobuild, require_buildreq_autoconf)
    (require_buildreq_automake, require_buildreq_autopoint)
    (require_buildreq_libtoolize, require_buildreq_patch): ...to
    these, respectively.  Adjust all callers.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

commit 44313522fcb32a47d5e61d97b6eaa6052daae516
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Thu Dec 8 12:08:16 2011 +0700

    bootstrap: ensure consistent function header comments.
    
    * bootstrap (require_bootstrap_uptodate)
    (require_buildtools_uptodate): Use `require_...' in header
    comment for these functions to be consistent with the rest,
    rather than `func_require_...'.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

commit 509907a28ecbb385ff144999d72c34d0503ca430
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Thu Dec 8 11:54:40 2011 +0700

    bootstrap: make sure patch is available to bootstrap if necessary.
    
    Make sure we're not lacking any functionality provided by the
    incumbent gnulib bootstrap script, and where it's easy to do so
    (like it is here), provide better functionality!
    * bootstrap (require_patch): Make sure that PATCH expands to the
    best `patch' command available on the system, honouring
    overrides in the users environment.
    (require_patch_buildreq): Automatically add a requirement for a
    patch command to buildreq when there are diff files in
    $local_gl_dir.
    (func_require_buildtools_uptodate): Call require_patch_buildreq
    before testing build tool versions.
    (func_gnulib_tool_copy_file): Make sure PATCH is set before using
    gnulib-tool to copy files.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

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

Summary of changes:
 bootstrap |  271 +++++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 163 insertions(+), 108 deletions(-)

diff --git a/bootstrap b/bootstrap
index ae65e37..28f85b0 100755
--- a/bootstrap
+++ b/bootstrap
@@ -556,6 +556,7 @@ func_gnulib_tool_copy_file ()
 
     $require_gnulib_path
     $require_gnulib_tool
+    $require_patch
 
     gnulib_copy_cmd="$gnulib_tool --copy-file"
     $opt_copy || func_append gnulib_copy_cmd " --symlink"
@@ -861,74 +862,6 @@ func_require_aclocal_amflags ()
 }
 
 
-# require_autobuild_buildreq
-# --------------------------
-# Try to find whether the bootstrap requires autobuild.
-require_autobuild_buildreq=func_require_autobuild_buildreq
-func_require_autobuild_buildreq ()
-{
-    $debug_cmd
-
-    $require_macro_dir
-
-    test -f "$macro_dir/autobuild.m4" \
-        || printf '%s\n' "$buildreq" |func_grep_q '^[	 ]*autobuild' \
-        || {
-      func_extract_trace AB_INIT
-      test -n "$func_extract_trace_result" && {
-        func_append buildreq 'autobuild - http://josefsson.org/autobuild/
-'
-        func_verbose "auto-adding \`autobuild' to build requirements"
-      }
-    }
-
-    require_autobuild_buildreq=:
-}
-
-
-# require_autoconf_buildreq
-# require_autopoint_buildreq
-# require_libtoolize_buildreq
-# ---------------------------
-# Try to find the minimum compatible version of autoconf/libtool
-# required to bootstrap successfully, and add it to `$buildreq'.
-for tool in autoconf libtoolize autopoint; do
-  b=$tool
-  v=require_${tool}_buildreq
-  f=func_$v
-  case $tool in
-    autoconf) m=AC_PREREQ ;;
-    libtoolize) m=LT_PREREQ; b=libtool ;;
-    autopoint) m=AM_GNU_GETTEXT_VERSION b=gettext ;;
-  esac
-
-  eval $v'='$f'
-  '$f' ()
-  {
-    $debug_cmd
-
-    # The following is ignored if undefined, but might be necessary
-    # in order for `func_find_tool` to run.
-    ${require_'$tool'-:}
-
-    printf '%s\n' "$buildreq" |func_grep_q '\''^[	 ]*'$tool\'' || {
-      func_extract_trace '$m'
-      _G_version=$func_extract_trace_result
-      test -n "$_G_version" && {
-        func_append buildreq "\
-            '$tool' $_G_version http://www.gnu.org/s/'$b'
-"
-        func_verbose \
-            "auto-adding \`'$tool'-$_G_version'\'' to build requirements"
-      }
-    }
-
-    '$v'=:
-  }
-'
-done
-
-
 # require_autoheader
 # ------------------
 # Skip autoheader if it's not needed.
@@ -956,37 +889,6 @@ func_require_autoheader ()
 }
 
 
-# require_automake_buildreq
-# -------------------------
-# Try to find the minimum compatible version of automake required to
-# bootstrap successfully, and add it to `$buildreq'.
-require_automake_buildreq=func_require_automake_buildreq
-func_require_automake_buildreq ()
-{
-    $debug_cmd
-
-    # if automake is not already listed in $buildreq...
-    printf '%s\n' "$buildreq" |func_grep_q automake || {
-      func_extract_trace AM_INIT_AUTOMAKE
-
-      # ...and AM_INIT_AUTOMAKE is declared...
-      test -n "$func_extract_trace_result" && {
-        automake_version=`echo "$func_extract_trace_result" \
-           |$SED 's|[^0-9]*||; s| .*$||'`
-        test -n "$automake_version" || automake_version=-
-
-        func_append buildreq "\
-            automake $automake_version http://www.gnu.org/s/automake
-"
-        func_verbose \
-            "auto-adding \`automake-$automake_version' to build requirements"
-      }
-    }
-
-    require_automake_buildreq=:
-}
-
-
 # require_autopoint
 # -----------------
 # Skip autopoint if it's not needed.
@@ -1012,8 +914,8 @@ func_require_autopoint ()
 }
 
 
-# func_require_bootstrap_uptodate
-# -------------------------------
+# require_bootstrap_uptodate
+# --------------------------
 # Complain if the version of bootstrap in the gnulib directory differs
 # from the one we are running.
 require_bootstrap_uptodate=func_require_bootstrap_uptodate
@@ -1066,8 +968,136 @@ func_require_build_aux ()
 }
 
 
-# func_require_buildtools_uptodate
-# --------------------------------
+# require_buildreq_autobuild
+# --------------------------
+# Try to find whether the bootstrap requires autobuild.
+require_buildreq_autobuild=func_require_buildreq_autobuild
+func_require_buildreq_autobuild()
+{
+    $debug_cmd
+
+    $require_macro_dir
+
+    test -f "$macro_dir/autobuild.m4" \
+        || printf '%s\n' "$buildreq" |func_grep_q '^[	 ]*autobuild' \
+        || {
+      func_extract_trace AB_INIT
+      test -n "$func_extract_trace_result" && {
+        func_append buildreq 'autobuild - http://josefsson.org/autobuild/
+'
+        func_verbose "auto-adding \`autobuild' to build requirements"
+      }
+    }
+
+    require_buildreq_autobuild=:
+}
+
+
+# require_buildreq_autoconf
+# require_buildreq_autopoint
+# require_buildreq_libtoolize
+# ---------------------------
+# Try to find the minimum compatible version of autoconf/libtool
+# required to bootstrap successfully, and add it to `$buildreq'.
+for tool in autoconf libtoolize autopoint; do
+  b=$tool
+  v=require_buildreq_${tool}
+  f=func_$v
+  case $tool in
+    autoconf) m=AC_PREREQ ;;
+    libtoolize) m=LT_PREREQ; b=libtool ;;
+    autopoint) m=AM_GNU_GETTEXT_VERSION b=gettext ;;
+  esac
+
+  eval $v'='$f'
+  '$f' ()
+  {
+    $debug_cmd
+
+    # The following is ignored if undefined, but might be necessary
+    # in order for `func_find_tool` to run.
+    ${require_'$tool'-:}
+
+    printf '\''%s\n'\'' "$buildreq" |func_grep_q '\''^[	 ]*'$tool\'' || {
+      func_extract_trace '$m'
+      _G_version=$func_extract_trace_result
+      test -n "$_G_version" && {
+        func_append buildreq "\
+            '$tool' $_G_version http://www.gnu.org/s/'$b'
+"
+        func_verbose \
+            "auto-adding \`'$tool'-$_G_version'\'' to build requirements"
+      }
+    }
+
+    '$v'=:
+  }
+'
+done
+
+
+# require_buildreq_automake
+# -------------------------
+# Try to find the minimum compatible version of automake required to
+# bootstrap successfully, and add it to `$buildreq'.
+require_buildreq_automake=func_require_buildreq_automake
+func_require_buildreq_automake()
+{
+    $debug_cmd
+
+    # if automake is not already listed in $buildreq...
+    printf '%s\n' "$buildreq" |func_grep_q automake || {
+      func_extract_trace AM_INIT_AUTOMAKE
+
+      # ...and AM_INIT_AUTOMAKE is declared...
+      test -n "$func_extract_trace_result" && {
+        automake_version=`echo "$func_extract_trace_result" \
+           |$SED 's|[^0-9]*||; s| .*$||'`
+        test -n "$automake_version" || automake_version=-
+
+        func_append buildreq "\
+            automake $automake_version http://www.gnu.org/s/automake
+"
+        func_verbose \
+            "auto-adding \`automake-$automake_version' to build requirements"
+      }
+    }
+
+    require_buildreq_automake=:
+}
+
+
+# require_buildreq_patch
+# ----------------------
+# Automatically add a patch build-requirement if there are diff files
+# in $local_gl_dir.
+require_buildreq_patch=func_require_buildreq_patch
+func_require_buildreq_patch ()
+{
+    $debug_cmd
+
+    # This ensures PATCH is set appropriately by the time
+    # func_check_versions enforces $buildreq.
+    $require_patch
+
+    # If patch is not already listed in $buildreq...
+    printf '%s\n' "$buildreq" |func_grep_q '^[	 ]*patch' || {
+      # The ugly find invocation is necessary to exit with non-zero
+      # status for old find binaries that don't support -exec fully.
+      if test ! -d "$local_gl_dir" \
+          || find "$local_gl_dir" -name *.diff -exec false {} +; then :
+      else
+          func_append buildreq 'patch - http://www.gnu.org/s/patch
+'
+      fi
+    }
+
+    require_buildreq_patch=:
+}
+
+
+# require_buildtools_uptodate
+# ---------------------------
 # Ensure all the packages listed in BUILDREQS are available on the build
 # machine at the minimum versions or better.
 require_buildtools_uptodate=func_require_buildtools_uptodate
@@ -1075,11 +1105,12 @@ func_require_buildtools_uptodate ()
 {
     $debug_cmd
 
-    $require_autobuild_buildreq
-    $require_autoconf_buildreq
-    $require_automake_buildreq
-    $require_libtoolize_buildreq
-    $require_autopoint_buildreq
+    $require_buildreq_autobuild
+    $require_buildreq_autoconf
+    $require_buildreq_automake
+    $require_buildreq_libtoolize
+    $require_buildreq_autopoint
+    $require_buildreq_patch
 
     test -n "$buildreq" && {
       _G_error_hdr=
@@ -1613,6 +1644,30 @@ func_gnulib_tool has installed the \`git-version-gen' script."
 }
 
 
+# require_patch
+# -------------
+# Find patch, according to the PATCH environment variable, or else
+# searching the user's PATH.
+require_patch=func_require_patch
+func_require_patch ()
+{
+    $debug_cmd
+
+    test -n "$PATCH" || {
+      # Find a patch program, preferring gpatch which is usually better
+      # than the vendor patch.
+      func_find_tool PATCH gpatch patch
+    }
+
+    func_verbose "export PATCH='$PATCH'"
+
+    # Make sure the search result is visible to subshells
+    export PATCH
+
+    require_patch=:
+}
+
+
 # require_source_base
 # -------------------
 # Ensure that source_base has a sensible value, extracted from


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Thu Dec 08 03:56:33 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RYZmL-00018G-SW
	for mharc-libtool-commit@gnu.org; Thu, 08 Dec 2011 03:56:33 -0500
Received: from eggs.gnu.org ([140.186.70.92]:34482)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RYZmI-00018A-Qf
	for libtool-commit@gnu.org; Thu, 08 Dec 2011 03:56:32 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RYZmG-0006zT-63
	for libtool-commit@gnu.org; Thu, 08 Dec 2011 03:56:30 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:50623)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RYZmG-0006zP-2r
	for libtool-commit@gnu.org; Thu, 08 Dec 2011 03:56:28 -0500
Received: from gary by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RYZmF-000777-I8
	for libtool-commit@gnu.org; Thu, 08 Dec 2011 08:56:27 +0000
Date: Thu, 08 Dec 2011 08:56:27 +0000
Message-Id: <E1RYZmF-000777-I8@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-131-gd5bcbf5
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: aead37d19ed17f1391f373c9599477e0e178cf0c
X-Git-Newrev: d5bcbf5f85ac1b4f5de75b7fec86ba220651c95e
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
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, 08 Dec 2011 08:56:32 -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  d5bcbf5f85ac1b4f5de75b7fec86ba220651c95e (commit)
       via  a1891ef344a601c450aded3719ef0bb256021baa (commit)
       via  402abf829e06be1938f7b8f064185944528e4c26 (commit)
      from  aead37d19ed17f1391f373c9599477e0e178cf0c (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 d5bcbf5f85ac1b4f5de75b7fec86ba220651c95e
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Thu Dec 8 15:34:27 2011 +0700

    libtoolize: reorder function definitions to keep func_filter_* together.
    
    * libtoolize: Restore asciibetical order, so that all the
    filter function definitions are together.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

commit a1891ef344a601c450aded3719ef0bb256021baa
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Thu Dec 8 15:26:48 2011 +0700

    libtoolize: use _filter as a prefix for better ordering.
    
    * libtoolize.m4sh (require_Makefile_am_filter)
    (require_ltdl_mk_filter, require_aclocal_m4_filter)
    (require_configure_ac_filter): Rename these functions from this...
    (require_filter_Makefile_am, require_filter_ltdl_mk)
    (require_filter_aclocal_m4, require_filter_configure_ac): ...to
    this, respectively.  Adjust all callers.
    (Makefile_am_filter, ltdl_mk_filter, aclocal_m4_filter)
    (configure_ac_filter): Rename these global variables from this...
    (filter_Makefile_am, filter_ltdl_mk, filter_aclocal_m4)
    (filter_configure_ac): ...to this, respectively.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

commit 402abf829e06be1938f7b8f064185944528e4c26
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Thu Dec 8 15:14:44 2011 +0700

    libtoolize: rename ltdl.mk filter function.
    
    * libtoolize.m4sh (require_Makefile_inc_filter): Rename from
    this...
    (require_ltdl_mk_filter): ...to this. Adjust all callers.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

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

Summary of changes:
 libtoolize.m4sh |  274 +++++++++++++++++++++++++++---------------------------
 1 files changed, 137 insertions(+), 137 deletions(-)

diff --git a/libtoolize.m4sh b/libtoolize.m4sh
index 31bbf3e..7e73098 100644
--- a/libtoolize.m4sh
+++ b/libtoolize.m4sh
@@ -787,8 +787,8 @@ func_install_pkgltdl_files ()
       pkgltdl_header="putting libltdl files in \`$ltdl_dir'."
     fi
 
-    $require_Makefile_am_filter
-    $require_Makefile_inc_filter
+    $require_filter_Makefile_am
+    $require_filter_ltdl_mk
 
     # Copy ltdl sources appropriate to the requested ltdl_mode.
     for file in $pkgltdl_files; do
@@ -796,23 +796,23 @@ func_install_pkgltdl_files ()
       case $file in
         Makefile.am|Makefile.in)
           test nonrecursive = "$ltdl_mode" && continue
-          my_copy_filter=$Makefile_am_filter
+          my_copy_filter=$filter_Makefile_am
           ;;
 
         ltdl.mk)
           test nonrecursive = "$ltdl_mode" || continue
-          my_copy_filter=$Makefile_inc_filter
+          my_copy_filter=$filter_ltdl_mk
           ;;
 
         aclocal.m4)
           test subproject = "$ltdl_mode" && {
-            $require_aclocal_m4_filter
+            $require_filter_aclocal_m4
 
             # Always copy aclocal.m4, otherwise regenerating it can
             # overwrite the destination if it is symlinked.
             ( opt_copy=:
               func_copy "$file" "$pkgltdldir" "$ltdl_dir" \
-                pkgltdl_header "$aclocal_m4_filter"
+                pkgltdl_header "$filter_aclocal_m4"
             )
           }
           continue
@@ -824,13 +824,13 @@ func_install_pkgltdl_files ()
 
         configure)
           test subproject = "$ltdl_mode" && {
-            $require_configure_ac_filter
+            $require_filter_configure_ac
 
             # Always copy configure, otherwise regenerating it can
             # overwrite the destination if it is symlinked.
             ( opt_copy=:
               func_copy "$file" "$pkgltdldir" "$ltdl_dir" \
-                pkgltdl_header "$configure_ac_filter"
+                pkgltdl_header "$filter_configure_ac"
             )
           }
           continue
@@ -838,8 +838,8 @@ func_install_pkgltdl_files ()
 
         configure.ac)
           test subproject = "$ltdl_mode" || continue
-          $require_configure_ac_filter
-          my_copy_filter=$configure_ac_filter
+          $require_filter_configure_ac
+          my_copy_filter=$filter_configure_ac
           ;;
       esac
 
@@ -1245,98 +1245,6 @@ for base in '' ltdl_; do
 done
 
 
-# require_Makefile_am_filter
-# --------------------------
-# Set `Makefile_am_filter' ready for passing to func_copy when libltdl's
-# stock Makefile.am contents need to be filtered to work in recursive
-# mode.
-require_Makefile_am_filter=func_require_Makefile_am_filter
-func_require_Makefile_am_filter ()
-{
-    $debug_cmd
-
-    $require_ltdl_mode
-
-    case $ltdl_mode in
-      recursive)
-        Makefile_am_filter='
-            /^[^#]/{
-              s|(LIBOBJS)|(ltdl_LIBOBJS)|g
-              s|(LTLIBOBJS)|(ltdl_LTLIBOBJS)|g
-            }'
-        ;;
-
-      subproject)
-        $require_ltdl_ac_aux_dir
-        $require_ltdl_am_macro_dir
-        $require_ltdl_relative_aux_dir
-        $require_ltdl_relative_macro_dir
-
-        test "$ltdl_am_macro_dir" = "$ltdl_relative_macro_dir" || {
-          my_am_macro_dir_regex=`$ECHO "\
-$ltdl_am_macro_dir" |$SED "$sed_make_literal_regex"`
-
-          Makefile_am_filter="
-            /^ACLOCAL_AMFLAGS = /{
-              s| -I $my_am_macro_dir_regex\$| -I $ltdl_relative_macro_dir|
-            }
-            s|dir)/$my_am_macro_dir_regex|dir)/$ltdl_relative_macro_dir|g"
-        }
-
-        test "$ltdl_ac_aux_dir" = "$ltdl_relative_aux_dir" || {
-          my_aux_dir_regex=`$ECHO "\
-$ltdl_ac_aux_dir" |$SED "$sed_make_literal_regex"`
-
-          Makefile_am_filter="$Makefile_am_filter
-            s|$my_aux_dir_regex|$ltdl_relative_aux_dir|g
-            s|/\./|/|g
-          "
-        }
-        ;;
-    esac
-
-    require_Makefile_am_filter=:
-}
-
-
-# require_Makefile_inc_filter
-# ---------------------------
-# Set `Makefile_inc_filter' ready for passing to func_copy in order for
-# the contents of Makefile.inc to match the nonrecursive libltdl
-# directory into which it is copied.
-require_Makefile_inc_filter=func_require_Makefile_inc_filter
-func_require_Makefile_inc_filter ()
-{
-    $debug_cmd
-
-    $require_ltdl_dir
-
-    # Note that we strip comments right here, rather than rely on
-    # using a $SED that allows comments.
-    my_uscore=`$ECHO "$ltdl_dir" | $SED 's|[/.+-]|_|g'`
-    Makefile_inc_filter=`$ECHO '
-      /^[^#]/{
-
-        # Use only libltdl conditional objects.
-        s|(LIBOBJS)|(ltdl_LIBOBJS)|g
-        s|(LTLIBOBJS)|(ltdl_LTLIBOBJS)|g
-
-        # Convert libltdl path and variable sections to $ltdl_dir.
-        s|libltdl_|@my_uscore@_|
-        s|libltdl/|@ltdl_dir@/|
-        s|: libltdl/|: @ltdl_dir@/|
-        s| -Ilibltdl | -I@ltdl_dir@ |
-        s|\$(libltdl_|\$(@my_uscore@_|
-        s|)/libltdl |)/@ltdl_dir@ |
-        s|@my_uscore@|'"$my_uscore"'|g
-        s|@ltdl_dir@|'"$ltdl_dir"'|g
-
-      }' | $SED '/^[	 ]*#/d;/^$/d'`
-
-    require_Makefile_inc_filter=:
-}
-
-
 # require_ac_aux_dir
 # ------------------
 # Extract ac_aux_dir from AC_CONFIG_AUX_DIR.
@@ -1459,35 +1367,6 @@ func_require_ac_macro_dir ()
 }
 
 
-# require_aclocal_m4_filter
-# -------------------------
-# Set `aclocal_m4_filter' ready for passing to func_copy when libltdl's
-# stock aclocal.m4 contents need to be filtered to work in recursive
-# mode.
-require_aclocal_m4_filter=func_require_aclocal_m4_filter
-func_require_aclocal_m4_filter ()
-{
-    $debug_cmd
-
-    $require_ltdl_am_macro_dir
-    $require_ltdl_relative_macro_dir
-
-    test "$ltdl_am_macro_dir" = "$ltdl_relative_macro_dir" || {
-      my_am_macro_dir_regex=`$ECHO "\
-$ltdl_am_macro_dir" |$SED "$sed_make_literal_regex"`
-
-      # Tricky [m] quoting to stop m4sh processing from flagging an
-      # undefined macro.
-      aclocal_m4_filter="
-        /^[m]4_include(/{
-          s|$my_am_macro_dir_regex|$ltdl_relative_macro_dir|g
-        }"
-    }
-
-    require_aclocal_m4_filter=:
-}
-
-
 # require_aux_dir
 # ---------------
 # Set aux_dir according to AC_CONFIG_AUX_DIR or else use the same
@@ -1552,13 +1431,96 @@ func_require_configure_ac ()
 }
 
 
-# require_configure_ac_filter
+# require_filter_Makefile_am
+# --------------------------
+# Set `filter_Makefile_am' ready for passing to func_copy when libltdl's
+# stock Makefile.am contents need to be filtered to work in recursive
+# mode.
+require_filter_Makefile_am=func_require_filter_Makefile_am
+func_require_filter_Makefile_am ()
+{
+    $debug_cmd
+
+    $require_ltdl_mode
+
+    case $ltdl_mode in
+      recursive)
+        filter_Makefile_am='
+            /^[^#]/{
+              s|(LIBOBJS)|(ltdl_LIBOBJS)|g
+              s|(LTLIBOBJS)|(ltdl_LTLIBOBJS)|g
+            }'
+        ;;
+
+      subproject)
+        $require_ltdl_ac_aux_dir
+        $require_ltdl_am_macro_dir
+        $require_ltdl_relative_aux_dir
+        $require_ltdl_relative_macro_dir
+
+        test "$ltdl_am_macro_dir" = "$ltdl_relative_macro_dir" || {
+          my_am_macro_dir_regex=`$ECHO "\
+$ltdl_am_macro_dir" |$SED "$sed_make_literal_regex"`
+
+          filter_Makefile_am="
+            /^ACLOCAL_AMFLAGS = /{
+              s| -I $my_am_macro_dir_regex\$| -I $ltdl_relative_macro_dir|
+            }
+            s|dir)/$my_am_macro_dir_regex|dir)/$ltdl_relative_macro_dir|g"
+        }
+
+        test "$ltdl_ac_aux_dir" = "$ltdl_relative_aux_dir" || {
+          my_aux_dir_regex=`$ECHO "\
+$ltdl_ac_aux_dir" |$SED "$sed_make_literal_regex"`
+
+          filter_Makefile_am="$filter_Makefile_am
+            s|$my_aux_dir_regex|$ltdl_relative_aux_dir|g
+            s|/\./|/|g
+          "
+        }
+        ;;
+    esac
+
+    require_filter_Makefile_am=:
+}
+
+
+# require_filter_aclocal_m4
+# -------------------------
+# Set `filter_aclocal_m4' ready for passing to func_copy when libltdl's
+# stock aclocal.m4 contents need to be filtered to work in recursive
+# mode.
+require_filter_aclocal_m4=func_require_filter_aclocal_m4
+func_require_filter_aclocal_m4 ()
+{
+    $debug_cmd
+
+    $require_ltdl_am_macro_dir
+    $require_ltdl_relative_macro_dir
+
+    test "$ltdl_am_macro_dir" = "$ltdl_relative_macro_dir" || {
+      my_am_macro_dir_regex=`$ECHO "\
+$ltdl_am_macro_dir" |$SED "$sed_make_literal_regex"`
+
+      # Tricky [m] quoting to stop m4sh processing from flagging an
+      # undefined macro.
+      filter_aclocal_m4="
+        /^[m]4_include(/{
+          s|$my_am_macro_dir_regex|$ltdl_relative_macro_dir|g
+        }"
+    }
+
+    require_filter_aclocal_m4=:
+}
+
+
+# require_filter_configure_ac
 # ---------------------------
-# Set `configure_ac_filter' ready for passing to func_copy when
+# Set `filter_configure_ac' ready for passing to func_copy when
 # libltdl's stock configure.ac contents need to be filtered to work in
 # subproject mode.
-require_configure_ac_filter=func_require_configure_ac_filter
-func_require_configure_ac_filter ()
+require_filter_configure_ac=func_require_filter_configure_ac
+func_require_filter_configure_ac ()
 {
     $debug_cmd
 
@@ -1569,12 +1531,50 @@ func_require_configure_ac_filter ()
       my_aux_dir_regex=`$ECHO "\
 $ltdl_ac_aux_dir" |$SED "$sed_make_literal_regex"`
 
-      configure_ac_filter="
+      filter_configure_ac="
         s|$my_aux_dir_regex|$ltdl_relative_aux_dir|g
       "
     }
 
-    require_configure_ac_filter=:
+    require_filter_configure_ac=:
+}
+
+
+# require_filter_ltdl_mk
+# ----------------------
+# Set `filter_ltdl_mk' ready for passing to func_copy in order for the
+# contents of ltdl.mk to match the nonrecursive libltdl directory into
+# which it is copied.
+require_filter_ltdl_mk=func_require_filter_ltdl_mk
+func_require_filter_ltdl_mk ()
+{
+    $debug_cmd
+
+    $require_ltdl_dir
+
+    # Note that we strip comments right here, rather than rely on
+    # using a $SED that allows comments.
+    my_uscore=`$ECHO "$ltdl_dir" | $SED 's|[/.+-]|_|g'`
+    filter_ltdl_mk=`$ECHO '
+      /^[^#]/{
+
+        # Use only libltdl conditional objects.
+        s|(LIBOBJS)|(ltdl_LIBOBJS)|g
+        s|(LTLIBOBJS)|(ltdl_LTLIBOBJS)|g
+
+        # Convert libltdl path and variable sections to $ltdl_dir.
+        s|libltdl_|@my_uscore@_|
+        s|libltdl/|@ltdl_dir@/|
+        s|: libltdl/|: @ltdl_dir@/|
+        s| -Ilibltdl | -I@ltdl_dir@ |
+        s|\$(libltdl_|\$(@my_uscore@_|
+        s|)/libltdl |)/@ltdl_dir@ |
+        s|@my_uscore@|'"$my_uscore"'|g
+        s|@ltdl_dir@|'"$ltdl_dir"'|g
+
+      }' | $SED '/^[	 ]*#/d;/^$/d'`
+
+    require_filter_ltdl_mk=:
 }
 
 


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Thu Dec 08 04:40:47 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RYaT9-0007AJ-Cw
	for mharc-libtool-commit@gnu.org; Thu, 08 Dec 2011 04:40:47 -0500
Received: from eggs.gnu.org ([140.186.70.92]:55410)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RYaT5-00077I-6Z
	for libtool-commit@gnu.org; Thu, 08 Dec 2011 04:40:46 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RYaSy-0005Qs-Gb
	for libtool-commit@gnu.org; Thu, 08 Dec 2011 04:40:43 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:33504)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RYaSy-0005Qn-Ci
	for libtool-commit@gnu.org; Thu, 08 Dec 2011 04:40:36 -0500
Received: from gary by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RYaSy-0004Qi-4z
	for libtool-commit@gnu.org; Thu, 08 Dec 2011 09:40:36 +0000
Date: Thu, 08 Dec 2011 09:40:36 +0000
Message-Id: <E1RYaSy-0004Qi-4z@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-134-g8a59ee7
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d5bcbf5f85ac1b4f5de75b7fec86ba220651c95e
X-Git-Newrev: 8a59ee7f0acdb83c3df12f47638966675a8af051
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
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, 08 Dec 2011 09:40:46 -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  8a59ee7f0acdb83c3df12f47638966675a8af051 (commit)
       via  e1f7c41462d9dd25c3ca92b7eae43838570e99e1 (commit)
       via  6bb8312ccf3f2505ad7d4b2f1572ea749c138623 (commit)
      from  d5bcbf5f85ac1b4f5de75b7fec86ba220651c95e (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 8a59ee7f0acdb83c3df12f47638966675a8af051
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Sat Nov 19 22:33:16 2011 +0700

    libtoolize: refactor copying filter creation.
    
    Prevent the various require_filter functions from becoming too
    long by factoring common code into new functions.
    * libtoolize (func_make_relative_dir_filter)
    (func_make_relative_ltdl_filter): New functions. Generalize and
    consolidate the various similar snippets for concatenating
    together the sed scripts for func_copy filtering.
    (require_filter_Makefile_am, require_filter_aclocal_m4)
    (require_filter_configure_ac): Simplify.
    (require_ltdl_relative_aux_dir): Remove.
    (require_ltdl_relative_macro_dir): Ditto.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

commit e1f7c41462d9dd25c3ca92b7eae43838570e99e1
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Sat Nov 19 20:54:43 2011 +0700

    maint: pick XSI funcs at runtime, not configure time.
    
    Determine, on a function by function basis, what XSI features
    are available in the shell that is actually running the script,
    rather than the one that was picked at configure time by the
    re-execution engine.
    * m4/libtool.m4 (_LT_PROG_FUNCTION_REPLACE)
    (_LT_PROG_REPLACE_SHELLFNS): Remove.
    (_LT_CHECK_SHELL_FEATURES): Remove tests for XSI and += support.
    * build-aux/general.m4sh (func_append, func_append_quoted)
    (func_arith, func_len, func_basename, func_dirname)
    (func_dirname_and_basename, func_stripname): List both enhanced
    and fallback implementations, and choose one based on whether
    the enhanced features required by the fastest version are
    available.
    * build-aux/getopt.m4sh (func_split_short_opt)
    (func_split_long_opt): Ditto.
    * build-aux/ltmain.m4sh (func_lo2o, func_xform): Ditto.
    * tests/getopt-m4sh.at: Add tests for enhanced and fallback
    implementations of func_arith, func_len, func_stripname and
    func_dirname_and_basename.
    * NEWS: Updated.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

commit 6bb8312ccf3f2505ad7d4b2f1572ea749c138623
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Sat Nov 19 18:01:28 2011 +0700

    maint: share useful functions from general.m4sh.
    
    * build-aux/ltmain.m4sh (func_append, func_append_quoted)
    (func_arith, func_len): Removed from here...
    * build-aux/general.m4sh (func_append, func_append_quoted)
    (func_arith, func_len): ...and added to here.
    (func_dirname, func_dirname_and_basename, func_normal_abspath)
    (func_relative_path): Use func_append.
    * tests/getopt-m4sh.at (_LT_AT_FALLBACK_FUNC_EXTRACT): Removed.
    Fallback functions are now in any m4sh generated file
    automatically.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

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

Summary of changes:
 NEWS                   |    4 +
 build-aux/general.m4sh |  186 +++++++++++++++++++++++++++++++++++++++---------
 build-aux/getopt.m4sh  |   45 ++++++++----
 build-aux/ltmain.m4sh  |   69 +++++++-----------
 libtoolize.m4sh        |  161 ++++++++++++++++++++++-------------------
 m4/libtool.m4          |  117 +------------------------------
 tests/getopt-m4sh.at   |  130 +++++++++++++++++++++------------
 7 files changed, 385 insertions(+), 327 deletions(-)

diff --git a/NEWS b/NEWS
index 0479a34..ecd4fa1 100644
--- a/NEWS
+++ b/NEWS
@@ -49,6 +49,10 @@ NEWS - list of user-visible changes between releases of GNU Libtool
     mode is selected; `--standalone' never worked, and is no longer
     accepted.
   - Libtool and libtoolize no longer choke on paths with a comma in them.
+  - In the case where $SHELL does not have the same enhanced features
+    (e.g. the ability to parse `var+=append') as $CONFIG_SHELL, libtool
+    will now correctly fallback to using only vanilla shell features
+    instead of failing with a parse at startup.
 
 ** Important incompatible changes:
 
diff --git a/build-aux/general.m4sh b/build-aux/general.m4sh
index 566dc39..252b2d2 100644
--- a/build-aux/general.m4sh
+++ b/build-aux/general.m4sh
@@ -73,29 +73,140 @@ IFS="	 $lt_nl"
 dirname='s|/[^/]*$||'
 basename='s|^.*/||'
 
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-    func_dirname_result=`$ECHO "$1" | $SED "$dirname"`
-    if test "X$func_dirname_result" = "X$1"; then
-      func_dirname_result=$3
-    else
-      func_dirname_result=$func_dirname_result$2
-    fi
-} # func_dirname may be replaced by extended shell implementation
+
+# lt_HAVE_PLUSEQ_OP
+# Can be empty, in which case the shell is probed, "yes" if += is useable
+# or anything else if += does not work.
+# NOTE: You can short-circuit the fork and test on every invocation (e.g.
+# on Windows where fork emulations are unreasonably slow) by setting this
+# in the environment of this script.
+test -z "$lt_HAVE_PLUSEQ_OP" \
+    && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \
+    && lt_HAVE_PLUSEQ_OP=yes
+
+if test yes = "$lt_HAVE_PLUSEQ_OP"; then
+  # func_append var value
+  # Append VALUE to the end of shell variable VAR.
+  eval 'func_append ()
+  {
+    eval "$1+=\$2"
+  }'
+
+  # func_append_quoted var value
+  # Quote VALUE and append to the end of shell variable VAR, separated
+  # by a space.
+  eval 'func_append_quoted ()
+  {
+    func_quote_for_eval "$2"
+    eval "$1+=\\ \$func_quote_for_eval_result"
+  }'
+else
+  func_append ()
+  {
+    eval "$1=\$$1\$2"
+  }
+
+  func_append_quoted ()
+  {
+    func_quote_for_eval "$2"
+    eval "$1=\$$1\\ \$func_quote_for_eval_result"
+  }
+fi
+
+
+# lt_HAVE_ARITH_OP
+# Can be empty, in which case the shell is probed, "yes" if $((...)) is
+# useable or anything else if it does not work.
+# NOTE: You can short-circuit the fork and test on every invocation (e.g.
+# on Windows where fork emulations are unreasonably slow) by setting this
+# in the environment of this script.
+test -z "$lt_HAVE_ARITH_OP" \
+    && (eval 'test 2 = $(( 1 + 1 ))') 2>/dev/null \
+    && lt_HAVE_ARITH_OP=yes
+
+# func_arith arithmetic-term...
+if test yes = "$lt_HAVE_ARITH_OP"; then
+  eval 'func_arith ()
+  {
+    func_arith_result=$(( $* ))
+  }'
+else
+  func_arith ()
+  {
+    func_arith_result=`expr "$@"`
+  }
+fi
+
+
+# lt_HAVE_XSI_OPS
+# Can be empty, in which case the shell is probed, "yes" if XSI length
+# and matching operators are useable or anything else if they do not work.
+# NOTE: You can short-circuit the fork and test on every invocation (e.g.
+# on Windows where fork emulations are unreasonably slow) by setting this
+# in the environment of this script.
+test -z "$lt_HAVE_XSI_OPS" \
+    && (eval 'x=a/b/c;
+      test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
+    && lt_HAVE_XSI_OPS=yes
+
+
+# func_len string
+# STRING may not start with a hyphen.
+if test yes = "$lt_HAVE_XSI_OPS"; then
+  eval 'func_len ()
+  {
+    func_len_result=${#1}
+  }'
+else
+  func_len ()
+  {
+    func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
+  }
+fi
+
+
+if test yes = "$lt_HAVE_XSI_OPS"; then
+  # If this shell supports suffix pattern removal, then use it to avoid
+  # forking. Hide the definitions single quotes in case the shell chokes
+  # on unsupported syntax...
+
+  _b='func_basename_result=${1##*/}'
+  _d='case $1 in
+        */*) func_dirname_result=${1%/*}$2 ;;
+        *  ) func_dirname_result=$3        ;;
+      esac'
+
+else
+  # ...otherwise fall back to using sed.
+
+  _b='func_basename_result=`$ECHO "$1" |$SED "$basename"`'
+  _d='func_dirname_result=`$ECHO "$1"  |$SED "$dirname"`
+      if test "X$func_dirname_result" = "X$1"; then
+        func_dirname_result=$3
+      else
+        func_append func_dirname_result "$2"
+      fi'
+fi
 
 
 # func_basename file
-func_basename ()
+eval 'func_basename ()
 {
-    func_basename_result=`$ECHO "$1" | $SED "$basename"`
-} # func_basename may be replaced by extended shell implementation
+    $debug_cmd
+    '"$_b"'
+}'
 
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+eval 'func_dirname ()
+{
+    $debug_cmd
+    '"$_d"'
+}'
 
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
+# func_dirname_and_basename file append nondir_replacement perform
+# func_basename and func_dirname in a single function
 # call:
 #   dirname:  Compute the dirname of FILE.  If nonempty,
 #             add APPEND to the result, otherwise set result
@@ -103,20 +214,14 @@ func_basename ()
 #             value returned in "$func_dirname_result"
 #   basename: Compute filename of FILE.
 #             value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
+# For efficiency, we do not delegate to the functions above but instead
+# duplicate the functionality here.
+eval 'func_dirname_and_basename ()
 {
-    # Extract subdirectory from the argument.
-    func_dirname_result=`$ECHO "$1" | $SED -e "$dirname"`
-    if test "X$func_dirname_result" = "X$1"; then
-      func_dirname_result=$3
-    else
-      func_dirname_result=$func_dirname_result$2
-    fi
-    func_basename_result=`$ECHO "$1" | $SED -e "$basename"`
-} # func_dirname_and_basename may be replaced by extended shell implementation
+    $debug_cmd
+    '"$_b"'
+    '"$_d"'
+}'
 
 
 # func_stripname prefix suffix name
@@ -125,13 +230,24 @@ func_dirname_and_basename ()
 # characters, hashes, percent signs, but SUFFIX may contain a leading
 # dot (in which case that matches only a dot).
 # func_strip_suffix prefix name
-func_stripname ()
-{
+if test yes = "$lt_HAVE_XSI_OPS"; then
+  eval 'func_stripname ()
+  {
+    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+    # positional parameters, so assign one to ordinary variable first.
+    func_stripname_result=$3
+    func_stripname_result=${func_stripname_result#"$1"}
+    func_stripname_result=${func_stripname_result%"$2"}
+  }'
+else
+  func_stripname ()
+  {
     case $2 in
       .*) func_stripname_result=`$ECHO "$3" | $SED "s%^$1%%; s%\\\\$2\$%%"`;;
       *)  func_stripname_result=`$ECHO "$3" | $SED "s%^$1%%; s%$2\$%%"`;;
     esac
-} # func_stripname may be replaced by extended shell implementation
+  }
+fi
 
 
 # These SED scripts presuppose an absolute path with a trailing slash.
@@ -212,7 +328,7 @@ func_normal_abspath ()
       ;;
       *)
         # Actual path component, append it.
-        func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
+        func_append func_normal_abspath_result "/$func_normal_abspath_tcomponent"
       ;;
     esac
   done
@@ -268,7 +384,7 @@ func_relative_path ()
   func_relative_path_result=$func_stripname_result
   func_stripname '/' '/' "$func_relative_path_tcancelled"
   if test -n "$func_stripname_result"; then
-    func_relative_path_result=$func_relative_path_result/$func_stripname_result
+    func_append func_relative_path_result "/$func_stripname_result"
   fi
 
   # Normalisation. If bindir is libdir, return `.' else relative path.
diff --git a/build-aux/getopt.m4sh b/build-aux/getopt.m4sh
index 27a8352..e5e9771 100644
--- a/build-aux/getopt.m4sh
+++ b/build-aux/getopt.m4sh
@@ -618,30 +618,49 @@ func_missing_arg ()
 }
 
 
-# func_split_short_opt shortopt
-# Set func_split_short_opt_name and func_split_short_opt_arg shell
-# variables after splitting SHORTOPT after the 2nd character.
-func_split_short_opt ()
-{
+# If this shell supports prefix and suffix pattern removal, then
+# use them to avoid forking. Hide the definition in an eval in case
+# the shell chokes on unsupported syntax...
+if test yes = "$lt_HAVE_XSI_OPS"; then
+  # func_split_short_opt shortopt
+  # Set func_split_short_opt_name and func_split_short_opt_arg shell
+  # variables after splitting SHORTOPT after the 2nd character.
+  eval 'func_split_short_opt ()
+  {
+    $debug_cmd
+
+    func_split_short_opt_arg=${1#??}
+    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}
+  }'
+
+  # func_split_long_opt longopt
+  # Set func_split_long_opt_name and func_split_long_opt_arg shell
+  # variables after splitting LONGOPT at the `=' sign.
+  eval 'func_split_long_opt ()
+  {
+    func_split_long_opt_name=${1%%=*}
+    func_split_long_opt_arg=${1#*=}
+  }'
+else
+  # ...otherwise fall back to using sed.
+  func_split_short_opt ()
+  {
     my_sed_short_opt='1s/^\(..\).*$/\1/;q'
     my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
 
     func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
     func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
-} # func_split_short_opt may be replaced by extended shell implementation
+  }
 
-
-# func_split_long_opt longopt
-# Set func_split_long_opt_name and func_split_long_opt_arg shell
-# variables after splitting LONGOPT at the `=' sign.
-func_split_long_opt ()
-{
+  func_split_long_opt ()
+  {
     my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
     my_sed_long_arg='1s/^--[^=]*=//'
 
     func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
     func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
-} # func_split_long_opt may be replaced by extended shell implementation
+  }
+fi
 
 exit_cmd=:
 ]])
diff --git a/build-aux/ltmain.m4sh b/build-aux/ltmain.m4sh
index 160d8af..922e957 100644
--- a/build-aux/ltmain.m4sh
+++ b/build-aux/ltmain.m4sh
@@ -148,50 +148,37 @@ extracted_serial=0
 # left over by shells.
 exec_cmd=
 
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-    eval "$1=\$$1\$2"
-} # func_append may be replaced by extended shell implementation
-
-# func_append_quoted var value
-# Quote VALUE and append to the end of shell variable VAR, separated
-# by a space.
-func_append_quoted ()
-{
-    func_quote_for_eval "$2"
-    eval "$1=\$$1\\ \$func_quote_for_eval_result"
-} # func_append_quoted may be replaced by extended shell implementation
-
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-    func_arith_result=`expr "$@"`
-} # func_arith may be replaced by extended shell implementation
-
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-    func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
-} # func_len may be replaced by extended shell implementation
 
+# If this shell supports prefix and suffix pattern removal, then
+# use them to avoid forking. Hide the definition in an eval in case
+# the shell chokes on unsupported syntax...
+if test yes = "$lt_HAVE_XSI_OPS"; then
+  # func_lo2o object
+  eval 'func_lo2o ()
+  {
+    case $1 in
+      *.lo) func_lo2o_result=${1%.lo}.$objext ;;
+      *   ) func_lo2o_result=$1               ;;
+    esac
+  }'
 
-# func_lo2o object
-func_lo2o ()
-{
+  # func_xform libobj-or-source
+  eval 'func_xform ()
+  {
+    func_xform_result=${1%.*}.lo
+  }'
+else
+  # ...otherwise fall back to using sed.
+  func_lo2o ()
+  {
     func_lo2o_result=`$ECHO "$1" | $SED "$lo2o"`
-} # func_lo2o may be replaced by extended shell implementation
-
+  }
 
-# func_xform libobj-or-source
-func_xform ()
-{
-    func_xform_result=`$ECHO "$1" | $SED 's/\.[^.]*$/.lo/'`
-} # func_xform may be replaced by extended shell implementation
+  func_xform ()
+  {
+    func_xform_result=`$ECHO "$1" | $SED 's|\.[^.]*$|.lo|'`
+  }
+fi
 
 
 # func_fatal_configuration arg...
diff --git a/libtoolize.m4sh b/libtoolize.m4sh
index 7e73098..624fd56 100644
--- a/libtoolize.m4sh
+++ b/libtoolize.m4sh
@@ -1093,6 +1093,66 @@ func_autoconf_configure ()
 }
 
 
+# func_make_relative_dir_filter CURRDIR SRCDIR DESTDIR [PREFIX [SUFFIX]]
+# ----------------------------------------------------------------------
+# Make a sed script suitable for appending to a copy filter, which will
+# replace occurrences of CURRDIR with the relative path from SRCDIR to
+# DESTDIR if they are different, otherwise the result is the empty
+# string:
+#
+#    func_make_relative_dir_filter ltdl config ../build-aux
+#      => 's|\.\./build-aux|../config|g'
+#    func_make_relative_dir_filter ltdl ltdl/m4 ../m4
+#      => 's|\.\./m4|m4|g'
+#    func_make_relative_dir_filter libltdl build-aux ../build-aux
+#      => ''
+#
+# If PREFIX (and SUFFIX) are passed they are prepended (and appended)
+# to the match and replacement expressions literally:
+#
+#    func_make_relative_dir_filter ltdl ltdl/m4 ../m4 '-I ' ' '
+#      => 's|-I \.\./m4 |-I m4 |g'
+func_make_relative_dir_filter ()
+{
+    $debug_cmd
+
+    my_currdir=$1
+    my_srcdir=$2
+    my_destdir=$3
+
+    func_relative_path "$my_srcdir" "$my_destdir"
+
+    if test "$my_currdir" = "$func_relative_path_result"; then
+      func_make_relative_dir_filter_result=
+    else
+      my_match_currdir=`$ECHO "$my_currdir" |$SED "$sed_make_literal_regex"`
+
+      # Avoid substituting with `dir/./file' when current dir is `.'.
+      if test . = "$my_currdir"; then
+        func_make_relative_dir_filter_result="
+          s|$4$my_match_currdir/$5|$4$5|g"
+      else
+        func_make_relative_dir_filter_result="
+          s|$4$my_match_currdir$5|$4$func_relative_path_result$5|g"
+      fi
+    fi
+}
+
+# func_make_relative_ltdl_filter CURRDIR DESTDIR [PREFIX [SUFFIX]]
+# ----------------------------------------------------------------
+# As `func_make_relative_dir_filter' optimised for the common case where
+# SRCDIR is `$ltdl_dir'.
+func_make_relative_ltdl_filter ()
+{
+    $debug_cmd
+
+    $require_ltdl_dir
+
+    func_make_relative_dir_filter "$1" "$ltdl_dir" "$2" "$3" "$4"
+    func_make_relative_ltdl_filter_result=$func_make_relative_dir_filter_result
+}
+
+
 ## -------------------- ##
 ## Resource management. ##
 ## -------------------- ##
@@ -1115,38 +1175,6 @@ func_autoconf_configure ()
 #
 # After that, the rest appear in asciibetical order.
 
-for base in aux_dir macro_dir; do
-
-  # require_ltdl_relative_aux_dir
-  # require_ltdl_relative_macro_dir
-  # -------------------------------
-  # Set ltdl_relative_aux_dir to the relative path from $ltdl_dir to
-  # the parent project auxiliary directory, and similarly for relative
-  # macro directory.
-  r=ltdl_relative_$base	# _r_esource acquired by calling this function
-  v=require_$r		# _v_ariable pointing to the function
-  f=func_$v		# _f_unction name
-  eval $v'='$f'
-  '$f' ()
-  {
-    $debug_cmd
-
-    $require_ltdl_dir
-    $require_'$base'
-
-    func_relative_path "$ltdl_dir" "$'$base'"
-    '$r'=$func_relative_path_result
-
-    test -n "$'$r'" && func_verbose "'$r'='\'\$$r\''"
-
-    '$v'=:
-  }'
-  # Some of these functions need to acquire the resource managed by the
-  # lexically preceding function; $o serves that purpose.
-  o=$r
-
-done
-
 for base in '' ltdl_; do
   if test ltdl_ = "$base"; then p='$pkgltdldir/'; else p=; fi
 
@@ -1453,31 +1481,23 @@ func_require_filter_Makefile_am ()
         ;;
 
       subproject)
-        $require_ltdl_ac_aux_dir
+        # Adjust default relative macro_dir paths.
         $require_ltdl_am_macro_dir
-        $require_ltdl_relative_aux_dir
-        $require_ltdl_relative_macro_dir
-
-        test "$ltdl_am_macro_dir" = "$ltdl_relative_macro_dir" || {
-          my_am_macro_dir_regex=`$ECHO "\
-$ltdl_am_macro_dir" |$SED "$sed_make_literal_regex"`
-
-          filter_Makefile_am="
-            /^ACLOCAL_AMFLAGS = /{
-              s| -I $my_am_macro_dir_regex\$| -I $ltdl_relative_macro_dir|
-            }
-            s|dir)/$my_am_macro_dir_regex|dir)/$ltdl_relative_macro_dir|g"
-        }
-
-        test "$ltdl_ac_aux_dir" = "$ltdl_relative_aux_dir" || {
-          my_aux_dir_regex=`$ECHO "\
-$ltdl_ac_aux_dir" |$SED "$sed_make_literal_regex"`
 
-          filter_Makefile_am="$filter_Makefile_am
-            s|$my_aux_dir_regex|$ltdl_relative_aux_dir|g
-            s|/\./|/|g
-          "
+        func_make_relative_ltdl_filter "$ltdl_am_macro_dir" "$macro_dir" '-I '
+        test -z "$func_make_relative_ltdl_filter_result" || {
+          func_append filter_Makefile_am "
+              /^ACLOCAL_AMFLAGS = /{
+                $func_make_relative_ltdl_filter_result
+              }"
         }
+        func_make_relative_ltdl_filter "$ltdl_am_macro_dir" "$macro_dir" 'dir)'
+        func_append filter_Makefile_am "$func_make_relative_ltdl_filter_result"
+
+        # Adjust default relative aux_dir paths.
+        $require_ltdl_ac_aux_dir
+        func_make_relative_ltdl_filter "$ltdl_ac_aux_dir" "$aux_dir"
+        func_append filter_Makefile_am "$func_make_relative_ltdl_filter_result"
         ;;
     esac
 
@@ -1496,18 +1516,16 @@ func_require_filter_aclocal_m4 ()
     $debug_cmd
 
     $require_ltdl_am_macro_dir
-    $require_ltdl_relative_macro_dir
-
-    test "$ltdl_am_macro_dir" = "$ltdl_relative_macro_dir" || {
-      my_am_macro_dir_regex=`$ECHO "\
-$ltdl_am_macro_dir" |$SED "$sed_make_literal_regex"`
-
-      # Tricky [m] quoting to stop m4sh processing from flagging an
-      # undefined macro.
-      filter_aclocal_m4="
-        /^[m]4_include(/{
-          s|$my_am_macro_dir_regex|$ltdl_relative_macro_dir|g
-        }"
+
+    func_make_relative_ltdl_filter "$ltdl_am_macro_dir" "$macro_dir"
+
+    # Tricky [m] quoting to stop m4sh processing from flagging an
+    # undefined macro.
+    test -z "$func_make_relative_ltdl_filter_result" || {
+      func_append filter_aclocal_m4 "
+          /^[m]4_include(/{
+            $func_make_relative_ltdl_filter_result
+          }"
     }
 
     require_filter_aclocal_m4=:
@@ -1525,16 +1543,9 @@ func_require_filter_configure_ac ()
     $debug_cmd
 
     $require_ltdl_ac_aux_dir
-    $require_ltdl_relative_aux_dir
-
-    test "$ltdl_ac_aux_dir" = "$ltdl_relative_aux_dir" || {
-      my_aux_dir_regex=`$ECHO "\
-$ltdl_ac_aux_dir" |$SED "$sed_make_literal_regex"`
 
-      filter_configure_ac="
-        s|$my_aux_dir_regex|$ltdl_relative_aux_dir|g
-      "
-    }
+    func_make_relative_ltdl_filter "$ltdl_ac_aux_dir" "$aux_dir"
+    func_append filter_configure_ac "$func_make_relative_ltdl_filter_result"
 
     require_filter_configure_ac=:
 }
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 4be85a5..0eef323 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -756,8 +756,6 @@ _LT_EOF
   sed '$q' "$ltmain" >> "$cfgfile" \
      || (rm -f "$cfgfile"; exit 1)
 
-  _LT_PROG_REPLACE_SHELLFNS
-
    mv -f "$cfgfile" "$ofile" ||
     (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
   chmod +x "$ofile"
@@ -7776,27 +7774,7 @@ dnl AC_DEFUN([LT_AC_PROG_SED], [])
 # Find out whether the shell is Bourne or XSI compatible,
 # or has some other useful features.
 m4_defun([_LT_CHECK_SHELL_FEATURES],
-[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy=a/b/c
-  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
-      = c,a/b,b/c, \
-    && eval 'test 2 -eq $(( 1 + 1 )) \
-    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-  && xsi_shell=yes
-AC_MSG_RESULT([$xsi_shell])
-_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
-
-AC_MSG_CHECKING([whether the shell understands "+="])
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
-    >/dev/null 2>&1 \
-  && lt_shell_append=yes
-AC_MSG_RESULT([$lt_shell_append])
-_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
-
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+[if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
   lt_unset=unset
 else
   lt_unset=false
@@ -7820,99 +7798,6 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
 ])# _LT_CHECK_SHELL_FEATURES
 
 
-# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
-# ------------------------------------------------------
-# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
-# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
-m4_defun([_LT_PROG_FUNCTION_REPLACE],
-[dnl {
-sed -e '/^$1 ()$/,/^} # $1 /c\
-$1 ()\
-{\
-m4_bpatsubsts([$2], [$], [\\], [^\([	 ]\)], [\\\1])
-} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-])
-
-
-# _LT_PROG_REPLACE_SHELLFNS
-# -------------------------
-# Replace existing portable implementations of several shell functions with
-# equivalent extended shell implementations where those features are available..
-m4_defun([_LT_PROG_REPLACE_SHELLFNS],
-[if test x"$xsi_shell" = xyes; then
-  _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
-    case @S|@1 in
-      */*) func_dirname_result=${1%/*}@S|@2 ;;
-      *  ) func_dirname_result=@S|@3 ;;
-    esac])
-
-  _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
-    func_basename_result=${1##*/}])
-
-  _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
-    case @S|@1 in
-      */*) func_dirname_result=${1%/*}@S|@2 ;;
-      *  ) func_dirname_result=@S|@3 ;;
-    esac
-    func_basename_result=${1##*/}])
-
-  _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
-    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-    # positional parameters, so assign one to ordinary parameter first.
-    func_stripname_result=@S|@3
-    func_stripname_result=${func_stripname_result#"@S|@1"}
-    func_stripname_result=${func_stripname_result%"@S|@2"}])
-
-  _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
-    func_split_long_opt_name=${1%%=*}
-    func_split_long_opt_arg=${1#*=}])
-
-  _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
-    func_split_short_opt_arg=${1#??}
-    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
-
-  _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
-    case @S|@1 in
-      *.lo) func_lo2o_result=${1%.lo}.$objext ;;
-      *)    func_lo2o_result=@S|@1 ;;
-    esac])
-
-  _LT_PROG_FUNCTION_REPLACE([func_xform], [    func_xform_result=${1%.*}.lo])
-
-  _LT_PROG_FUNCTION_REPLACE([func_arith], [    func_arith_result=$(( $[*] ))])
-
-  _LT_PROG_FUNCTION_REPLACE([func_len], [    func_len_result=${#1}])
-fi
-
-if test x"$lt_shell_append" = xyes; then
-  _LT_PROG_FUNCTION_REPLACE([func_append], [    eval "@S|@1+=\\@S|@2"])
-
-  _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
-    func_quote_for_eval "@S|@2"
-dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
-    eval "@S|@1+=\\\\ \\$func_quote_for_eval_result"])
-
-  # Save a `func_append' function call where possible by direct use of '+='
-  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
-    && mv -f "$cfgfile.tmp" "$cfgfile" \
-      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-  test 0 -eq $? || _lt_function_replace_fail=:
-else
-  # Save a `func_append' function call even when '+=' is not available
-  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
-    && mv -f "$cfgfile.tmp" "$cfgfile" \
-      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-  test 0 -eq $? || _lt_function_replace_fail=:
-fi
-
-if test x"$_lt_function_replace_fail" = x":"; then
-  AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
-fi
-])
-
 # _LT_PATH_CONVERSION_FUNCTIONS
 # -----------------------------
 # Determine which file name conversion functions should be used by
diff --git a/tests/getopt-m4sh.at b/tests/getopt-m4sh.at
index 5eec5c2..370eb0f 100644
--- a/tests/getopt-m4sh.at
+++ b/tests/getopt-m4sh.at
@@ -40,9 +40,22 @@ M4SH_GETOPTS(
   [a!],	[--append],	[],	[func_append list "$optarg$nl"],
   [f],	[--force],	[],	[opts="$opts force"],
   [i],	[--install],	[],	[opts="$opts install"],
+  [l;],	[--length],	[],	[],
+  [p!],	[--path],	[],	[func_dirname_and_basename "$optarg"],
   [v],	[--verbose],	[],	[opts="$opts verbose"],
   [!],	[--ltdl],	[false],[opts="$opts ltdl=$optarg"],
-[echo "$list" $opts])
+[test -z "$opt_length" || {
+  for s in $opt_length; do
+    func_len "$s"
+    func_arith ${len-0} + $func_len_result; len=$func_arith_result
+  done
+  echo len=$len
+}
+test -z "$opt_path" || {
+  func_stripname b_ .d "$func_basename_result"
+  echo "$func_dirname_result:$func_stripname_result"
+}
+test -z "$list$opts" || echo "$list" $opts])
 ]])
 m4_pattern_forbid([m4_include])
 m4_pattern_forbid([AS_INIT])
@@ -53,34 +66,11 @@ $SED "s|@LN_S\@|$LN_S|g;s|@SED\@|$SED|g" t-options > options
 ])# _LT_AT_GETOPT_M4SH_SETUP
 
 
-# _LT_AT_FALLBACK_FUNC_EXTRACT(FUNC-NAME)
-# ---------------------------------------
-# Extract the fallback function FUNC-NAME from ltmain.m4sh
-m4_define([_LT_AT_FALLBACK_FUNC_EXTRACT],
-[dnl {{
-$SED '/^# func_dirname /q' options > options.tmp
-echo '# func_append var value' >> options.tmp
-$SED -n '/^$1 ()/,/^} # $1 /p' $abs_top_srcdir/build-aux/ltmain.m4sh >> options.tmp
-$SED '1,/^# func_dirname/d' options >> options.tmp
-rm -f options && mv options.tmp options])
-
-
-# _LT_AT_EXTENDED_SHELL_FUNC_EXTRACT(FUNC-NAME)
-# ---------------------------------------------
-# Extract the 'Extended-shell'-decorated function FUNC-NAME from libtool
-m4_define([_LT_AT_XSI_FUNC_EXTRACT],
-[dnl {{
-$SED '/^# $1/q' options > options.tmp
-$SED -n '/^$1 ()/,/^} # Extended-shell $1 /p' $abs_top_builddir/libtool >> options.tmp
-$SED '1,/^} # $1 /d' options >> options.tmp
-rm -f options && mv options.tmp options])
-
-
 ## ----------------------- ##
 ## Short option splitting. ##
 ## ----------------------- ##
 
-AT_SETUP([short option splitting])
+AT_SETUP([fallback short option splitting])
 
 AT_DATA(expout,
 [[ force verbose install
@@ -88,22 +78,18 @@ AT_DATA(expout,
 
 _LT_AT_GETOPT_M4SH_SETUP
 
-AT_CHECK([$SHELL ./options -fvi], 0, [expout])
+AT_CHECK([lt_HAVE_XSI_OPS=no $SHELL ./options -fvi], 0, [expout])
 
 AT_CLEANUP
 
 
-AT_SETUP([enhanced shell short option splitting])
-
-# Don't bother with additional XSI checks unless functions were substituted
-AT_CHECK([fgrep '@%:@ Extended-shell func_split_short_opt' $abs_top_builddir/libtool >/dev/null 2>&1 || (exit 77)])
+AT_SETUP([enhanced short option splitting])
 
 AT_DATA(expout,
 [[ force verbose install
 ]])
 
 _LT_AT_GETOPT_M4SH_SETUP
-_LT_AT_XSI_FUNC_EXTRACT(func_split_short_opt)
 
 AT_CHECK([$SHELL ./options -fvi], 0, [expout])
 
@@ -114,7 +100,7 @@ AT_CLEANUP
 ## Long option splitting. ##
 ## ---------------------- ##
 
-AT_SETUP([long option splitting])
+AT_SETUP([fallback long option splitting])
 
 AT_DATA(expout,
 [[ ltdl=long
@@ -122,22 +108,18 @@ AT_DATA(expout,
 
 _LT_AT_GETOPT_M4SH_SETUP
 
-AT_CHECK([$SHELL ./options --ltdl=long], 0, [expout])
+AT_CHECK([lt_HAVE_XSI_OPS=no $SHELL ./options --ltdl=long], 0, [expout])
 
 AT_CLEANUP
 
 
-AT_SETUP([XSI long option splitting])
-
-# Don't bother with additional XSI checks unless functions were substituted
-AT_CHECK([fgrep '@%:@ Extended-shell func_split_long_opt' $abs_top_builddir/libtool >/dev/null 2>&1 || (exit 77)])
+AT_SETUP([enhanced long option splitting])
 
 AT_DATA(expout,
 [[ ltdl=long
 ]])
 
 _LT_AT_GETOPT_M4SH_SETUP
-_LT_AT_XSI_FUNC_EXTRACT(func_split_long_opt)
 
 AT_CHECK([$SHELL ./options --ltdl=long], 0, [expout])
 
@@ -148,7 +130,7 @@ AT_CLEANUP
 ## Option appending. ##
 ## ----------------- ##
 
-AT_SETUP([option appending])
+AT_SETUP([fallback option appending])
 
 AT_DATA(expout,
 [[first   --append second
@@ -157,17 +139,13 @@ third
 ]])
 
 _LT_AT_GETOPT_M4SH_SETUP
-_LT_AT_FALLBACK_FUNC_EXTRACT(func_append)
 
-AT_CHECK([$SHELL ./options -a "first   --append second" -athird], 0, [expout])
+AT_CHECK([lt_HAVE_PLUSEQ_OP=no $SHELL ./options -a "first   --append second" -athird], 0, [expout])
 
 AT_CLEANUP
 
 
-AT_SETUP([enhanced shell option appending])
-
-# Don't bother with additional += check unless functions were substituted
-AT_CHECK([fgrep '@%:@ Extended-shell func_append ' $abs_top_builddir/libtool >/dev/null 2>&1 || (exit 77)])
+AT_SETUP([enhanced option appending])
 
 AT_DATA(expout,
 [[first   --append second
@@ -176,9 +154,67 @@ third
 ]])
 
 _LT_AT_GETOPT_M4SH_SETUP
-_LT_AT_FALLBACK_FUNC_EXTRACT(func_append)
-_LT_AT_XSI_FUNC_EXTRACT(func_append)
 
 AT_CHECK([$SHELL ./options -a "first   --append second" -athird], 0, [expout])
 
 AT_CLEANUP
+
+
+## ----------------- ##
+## Shell arithmetic. ##
+## ----------------- ##
+
+AT_SETUP([fallback arithmetic])
+
+AT_DATA(expout,
+[[len=9
+]])
+
+_LT_AT_GETOPT_M4SH_SETUP
+
+AT_CHECK([lt_HAVE_ARITH_OP=no $SHELL ./options -l short --length long], 0, [expout])
+
+AT_CLEANUP
+
+
+AT_SETUP([enhanced arithmetic])
+
+AT_DATA(expout,
+[[len=9
+]])
+
+_LT_AT_GETOPT_M4SH_SETUP
+
+AT_CHECK([$SHELL ./options -l short --length long], 0, [expout])
+
+AT_CLEANUP
+
+
+## ------------- ##
+## Path slicing. ##
+## ------------- ##
+
+AT_SETUP([fallback path slicing])
+
+AT_DATA(expout,
+[[a:c
+]])
+
+_LT_AT_GETOPT_M4SH_SETUP
+
+AT_CHECK([lt_HAVE_XSI_OPS=no $SHELL ./options -p a/b_c.d], 0, [expout])
+
+AT_CLEANUP
+
+
+AT_SETUP([enhanced path slicing])
+
+AT_DATA(expout,
+[[a:c
+]])
+
+_LT_AT_GETOPT_M4SH_SETUP
+
+AT_CHECK([$SHELL ./options -p a/b_c.d], 0, [expout])
+
+AT_CLEANUP


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Thu Dec 08 05:45:15 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RYbTX-0006qn-Op
	for mharc-libtool-commit@gnu.org; Thu, 08 Dec 2011 05:45:15 -0500
Received: from eggs.gnu.org ([140.186.70.92]:49895)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RYbTU-0006pe-B8
	for libtool-commit@gnu.org; Thu, 08 Dec 2011 05:45:13 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RYbTS-0000Q9-P8
	for libtool-commit@gnu.org; Thu, 08 Dec 2011 05:45:12 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:39435)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RYbTS-0000Q3-IN
	for libtool-commit@gnu.org; Thu, 08 Dec 2011 05:45:10 -0500
Received: from gary by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RYbTS-0004bY-17
	for libtool-commit@gnu.org; Thu, 08 Dec 2011 10:45:10 +0000
Date: Thu, 08 Dec 2011 10:45:10 +0000
Message-Id: <E1RYbTS-0004bY-17@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-138-gf7bd6bd
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 8a59ee7f0acdb83c3df12f47638966675a8af051
X-Git-Newrev: f7bd6bd9ccc54a061702b66d3fe9da4fdadcd2fc
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
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, 08 Dec 2011 10:45: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  f7bd6bd9ccc54a061702b66d3fe9da4fdadcd2fc (commit)
       via  ccd0cea1a598f59287e97f2dbc0204f04965d004 (commit)
       via  28471749102ee5c566557525f358c8ca50aa5023 (commit)
       via  083d303cb8e77b5aed0315c65672b2066eb8a696 (commit)
      from  8a59ee7f0acdb83c3df12f47638966675a8af051 (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 f7bd6bd9ccc54a061702b66d3fe9da4fdadcd2fc
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Thu Dec 8 17:38:13 2011 +0700

    tests: s/snippit/snippet/.
    
    * tests/demo/foo.h, tests/pdemo/foo.h: Spell `snippet' correctly.
    Reported by Stefano Lattarini.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

commit ccd0cea1a598f59287e97f2dbc0204f04965d004
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Thu Dec 8 17:33:28 2011 +0700

    tests: make sure file restore traps are called correctly on AIX.
    
    * tests/demo-noinst-link.test (func_save_files): set the restore
    trap outside a function, otherwise AIX 5.3 /bin/sh will run the
    trap at the end of the function, instead of when the script
    exits.
    * tests/demo-relink.test (func_save_files): Ditto.
    * tests/depdemo-relink.test (func_save_files): Ditto.
    Reported by Stefano Lattarini.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

commit 28471749102ee5c566557525f358c8ca50aa5023
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Thu Dec 8 17:11:45 2011 +0700

    maint: eliminate some more spurious leading Xs.
    
    * m4/libtool.m4: Reverse argument order to eliminate spurious
    leading X's.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

commit 083d303cb8e77b5aed0315c65672b2066eb8a696
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Thu Dec 8 17:09:02 2011 +0700

    bootstrap: put back missing spaces before parens.
    
    * bootstrap (func_require_buildreq_autobuild)
    (func_require_buildreq_automake): Vi's delete word command is
    too greedy and also eats trailing whitespace before following
    non-word-chars. Put back the spaces it ate so that
    syntax-checks pass once again.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

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

Summary of changes:
 bootstrap                   |    4 ++--
 m4/libtool.m4               |    4 ++--
 tests/demo-noinst-link.test |    5 ++++-
 tests/demo-relink.test      |    4 +++-
 tests/demo/foo.h            |    2 +-
 tests/depdemo-relink.test   |    4 +++-
 tests/pdemo/foo.h           |    2 +-
 7 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/bootstrap b/bootstrap
index 28f85b0..147ac08 100755
--- a/bootstrap
+++ b/bootstrap
@@ -972,7 +972,7 @@ func_require_build_aux ()
 # --------------------------
 # Try to find whether the bootstrap requires autobuild.
 require_buildreq_autobuild=func_require_buildreq_autobuild
-func_require_buildreq_autobuild()
+func_require_buildreq_autobuild ()
 {
     $debug_cmd
 
@@ -1041,7 +1041,7 @@ done
 # Try to find the minimum compatible version of automake required to
 # bootstrap successfully, and add it to `$buildreq'.
 require_buildreq_automake=func_require_buildreq_automake
-func_require_buildreq_automake()
+func_require_buildreq_automake ()
 {
     $debug_cmd
 
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 0eef323..9c2574f 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -198,7 +198,7 @@ aix3*)
   # AIX sometimes has problems with the GCC collect2 program.  For some
   # reason, if we set the COLLECT_NAMES environment variable, the problems
   # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
+  if test set != "${COLLECT_NAMES+set}"; then
     COLLECT_NAMES=
     export COLLECT_NAMES
   fi
@@ -739,7 +739,7 @@ _LT_EOF
 # AIX sometimes has problems with the GCC collect2 program.  For some
 # reason, if we set the COLLECT_NAMES environment variable, the problems
 # vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
+if test set != "${COLLECT_NAMES+set}"; then
   COLLECT_NAMES=
   export COLLECT_NAMES
 fi
diff --git a/tests/demo-noinst-link.test b/tests/demo-noinst-link.test
index 5e658b0..5654ff9 100755
--- a/tests/demo-noinst-link.test
+++ b/tests/demo-noinst-link.test
@@ -38,13 +38,16 @@ func_save_files ()
     func_mkdir_p "$objdir/temp/libs"
     cp -f libhello.la "hell$EXEEXT" "$objdir/temp"
     cp -f "$objdir"/* "$objdir"/temp/libs
-    trap "func_restore_files" 0 1 2 13 15
 }
 
 func_require "demo-inst" "$prefix/lib/libhello.la"
 
 func_mkprefixdir
 func_cd "tests/demo"
+
+# AIX 5.3 `/bin/sh' will invoke the trap for 0 at the end of a
+# function, so we set the trap outside of a function to be portable.
+trap func_restore_files 0 1 2 13 15
 func_save_files
 
 func_msg "removing \`libhello.la' and \`hell' from demo"
diff --git a/tests/demo-relink.test b/tests/demo-relink.test
index b463441..4b32fba 100755
--- a/tests/demo-relink.test
+++ b/tests/demo-relink.test
@@ -37,7 +37,6 @@ func_save_files ()
     func_mkdir_p "$objdir/temp/libs"
     cp -f libhello.la "$objdir/temp"
     cp -f "$objdir"/libhello.* "$objdir/lt-hell$EXEEXT" "$objdir/temp/libs"
-    trap "func_restore_files" 0 1 2 13 15
 }
 
 func_require "demo-inst" "$prefix/lib/libhello.la"  "tests/demo/libhello.la"
@@ -50,7 +49,10 @@ func_get_config "library_names" "cat libhello.la"
 test -z "$library_names" \
   && func_skip "Exiting: demo/libhello.la is not a shared library"
 
+# AIX 5.3 `/bin/sh' will invoke the trap for 0 at the end of a
+# function, so we set the trap outside of a function to be portable.
 func_save_files
+trap func_restore_files 0 1 2 13 15
 
 func_get_config 'shlibpath_overrides_runpath
 hardcode_action
diff --git a/tests/demo/foo.h b/tests/demo/foo.h
index 5609d8d..9ee7f2e 100644
--- a/tests/demo/foo.h
+++ b/tests/demo/foo.h
@@ -27,7 +27,7 @@ or obtained by writing to the Free Software Foundation, Inc.,
 #define _FOO_H_ 1
 
 /* At some point, cygwin will stop defining __CYGWIN32__, but b19 and
- * earlier do not define __CYGWIN__.  This snippit allows us to check
+ * earlier do not define __CYGWIN__.  This snippet allows us to check
  * for __CYGWIN__ reliably for both current, old, and (probable) future
  * releases.
  */
diff --git a/tests/depdemo-relink.test b/tests/depdemo-relink.test
index 382f36c..0d01279 100755
--- a/tests/depdemo-relink.test
+++ b/tests/depdemo-relink.test
@@ -47,7 +47,6 @@ func_save_files ()
       && cp -f "$objdir/depdemo$EXEEXT" "_fnord/temp"
     cp -f l3/libl3.la "_fnord/temp"
     cp -f l3/"$objdir"/* "_fnord/temp/libs"
-    trap "func_restore_files" 0 1 2 13 15
 }
 
 func_require "depdemo-inst" "$prefix/lib/libl3.la"  "tests/depdemo/l3/libl3.la"
@@ -60,6 +59,9 @@ func_get_config "library_names" "cat l3/libl3.la"
 test -z "$library_names" \
   && func_skip "Exiting: depdemo/l3/libl3.la is not a shared library"
 
+# AIX 5.3 `/bin/sh' will invoke the trap for 0 at the end of a
+# function, so we set the trap outside of a function to be portable.
+trap func_restore_files 0 1 2 13 15
 func_save_files
 
 func_get_config 'shlibpath_overrides_runpath
diff --git a/tests/pdemo/foo.h b/tests/pdemo/foo.h
index 2f666f3..1843783 100644
--- a/tests/pdemo/foo.h
+++ b/tests/pdemo/foo.h
@@ -27,7 +27,7 @@ or obtained by writing to the Free Software Foundation, Inc.,
 #define _FOO_H_ 1
 
 /* At some point, cygwin will stop defining __CYGWIN32__, but b19 and
- * earlier do not define __CYGWIN__.  This snippit allows us to check
+ * earlier do not define __CYGWIN__.  This snippet allows us to check
  * for __CYGWIN32__ reliably for both old and (probable) future releases.
  */
 #ifdef __CYGWIN__


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Thu Dec 08 09:51:25 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RYfJl-0003Zg-VC
	for mharc-libtool-commit@gnu.org; Thu, 08 Dec 2011 09:51:25 -0500
Received: from eggs.gnu.org ([140.186.70.92]:34387)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RYfJj-0003Yt-DR
	for libtool-commit@gnu.org; Thu, 08 Dec 2011 09:51:24 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RYfJe-0007np-VD
	for libtool-commit@gnu.org; Thu, 08 Dec 2011 09:51:23 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:37881)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RYfJe-0007na-QL
	for libtool-commit@gnu.org; Thu, 08 Dec 2011 09:51:18 -0500
Received: from gary by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RYfJd-0007pQ-Jy
	for libtool-commit@gnu.org; Thu, 08 Dec 2011 14:51:18 +0000
Date: Thu, 08 Dec 2011 14:51:17 +0000
Message-Id: <E1RYfJd-0007pQ-Jy@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-139-g0009ef8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: f7bd6bd9ccc54a061702b66d3fe9da4fdadcd2fc
X-Git-Newrev: 0009ef898866ec536c04a1d20b6f01947e07070b
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
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, 08 Dec 2011 14:51: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  0009ef898866ec536c04a1d20b6f01947e07070b (commit)
      from  f7bd6bd9ccc54a061702b66d3fe9da4fdadcd2fc (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 0009ef898866ec536c04a1d20b6f01947e07070b
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Thu Dec 8 21:48:03 2011 +0700

    maint: disable prohibit_always-defined_macros syntax check.
    
    Aside from Apple grep silently failing to run this test and
    report violations, libtool still uses non-gnulib versions of
    dirent.h and argz.h which use the same macros, but are not
    always-defined.
    * cfg.mk (local-checks-to-fix): Move
    sc_prohibit_always-defined_macros from here...
    (local-checks-to-skip): ...to here.
    Reported by Peter O'Gorman.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

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

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

diff --git a/cfg.mk b/cfg.mk
index dc89660..ef1637a 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -38,7 +38,6 @@ endif
 VC_LIST_ALWAYS_EXCLUDE_REGEX = ^mail/
 
 local-checks-to-fix =				\
-	sc_prohibit_always-defined_macros	\
 	sc_require_config_h			\
 	sc_require_config_h_first
 
@@ -46,12 +45,16 @@ local-checks-to-skip =				\
 	$(local-checks-to-fix)			\
 	sc_GPL_version				\
 	sc_cast_of_x_alloc_return_value		\
+	sc_prohibit_always-defined_macros	\
 	sc_trailing_blank			\
 	sc_unmarked_diagnostics
 
 # GPL_version: checks for GPLv3, which we don't use
 # cast_of_x_alloc_return_value:
 #         We support C++ compilation which does require casting here.
+# prohibit_always-defined_macros:
+#	we have our own argz and dirent, which use the same macros but
+#	which are not always-defined in our case.
 # trailing_blank: flags valid rfc3676 separators
 # unmarked_diagnostics: libtool isn't internationalized
 


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Mon Dec 12 22:25:45 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RaIzx-0008DG-2O
	for mharc-libtool-commit@gnu.org; Mon, 12 Dec 2011 22:25:45 -0500
Received: from eggs.gnu.org ([140.186.70.92]:50216)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RaIzu-0008Cd-LD
	for libtool-commit@gnu.org; Mon, 12 Dec 2011 22:25:43 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RaIzt-0003ZJ-GJ
	for libtool-commit@gnu.org; Mon, 12 Dec 2011 22:25:42 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:39987)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RaIzt-0003YW-Ec
	for libtool-commit@gnu.org; Mon, 12 Dec 2011 22:25:41 -0500
Received: from pogma by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RaIzs-0001mG-Oi
	for libtool-commit@gnu.org; Tue, 13 Dec 2011 03:25:40 +0000
Date: Tue, 13 Dec 2011 03:25:40 +0000
Message-Id: <E1RaIzs-0001mG-Oi@vcs.savannah.gnu.org>
From: "Peter O'Gorman" <peter@pogma.com>
To: libtool-commit@gnu.org
Subject: [SCM] GNU Libtool branch, master, updated. v2.4.2-140-g88992fe
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 0009ef898866ec536c04a1d20b6f01947e07070b
X-Git-Newrev: 88992fe6771ec3258bde1b03314ce579da0ac2d5
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
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, 13 Dec 2011 03:25:43 -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  88992fe6771ec3258bde1b03314ce579da0ac2d5 (commit)
      from  0009ef898866ec536c04a1d20b6f01947e07070b (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 88992fe6771ec3258bde1b03314ce579da0ac2d5
Author: H.J. Lu <hongjiu.lu@intel.com>
Date:   Mon Dec 12 21:24:14 2011 -0600

    Support x32.
    
    * m4/libtool.m4 (_LT_ENABLE_LOCK): Support x32.

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

Summary of changes:
 m4/libtool.m4 |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 9c2574f..3639851 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -1321,7 +1321,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
 	    LD="${LD-ld} -m elf_i386_fbsd"
 	    ;;
 	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_i386"
+	    case `/usr/bin/file conftest.o` in
+	      *x86-64*)
+		LD="${LD-ld} -m elf32_x86_64"
+		;;
+	      *)
+		LD="${LD-ld} -m elf_i386"
+		;;
+	    esac
 	    ;;
 	  ppc64-*linux*|powerpc64-*linux*)
 	    LD="${LD-ld} -m elf32ppclinux"


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Sun Dec 18 00:22:07 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Rc9CJ-0007Br-Bb
	for mharc-libtool-commit@gnu.org; Sun, 18 Dec 2011 00:22:07 -0500
Received: from eggs.gnu.org ([140.186.70.92]:40997)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Rc9CG-0007Az-Eg
	for libtool-commit@gnu.org; Sun, 18 Dec 2011 00:22:05 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Rc9CF-0003zD-8B
	for libtool-commit@gnu.org; Sun, 18 Dec 2011 00:22:04 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:46013)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Rc9CF-0003z9-6f
	for libtool-commit@gnu.org; Sun, 18 Dec 2011 00:22:03 -0500
Received: from gary by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Rc9CE-0007Y2-L1
	for libtool-commit@gnu.org; Sun, 18 Dec 2011 05:22:02 +0000
Date: Sun, 18 Dec 2011 05:22:02 +0000
Message-Id: <E1Rc9CE-0007Y2-L1@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-141-g4099c12
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 88992fe6771ec3258bde1b03314ce579da0ac2d5
X-Git-Newrev: 4099c121a131784d3ab103bee848e971d8bfafcb
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
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, 18 Dec 2011 05:22:05 -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  4099c121a131784d3ab103bee848e971d8bfafcb (commit)
      from  88992fe6771ec3258bde1b03314ce579da0ac2d5 (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 4099c121a131784d3ab103bee848e971d8bfafcb
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Thu Dec 8 17:01:56 2011 +0700

    libtool: minimise forks per invocation under bash.
    
    * build-aux/general.m4sh (lt_HAVE_PLUSEQ_OP, lt_HAVE_ARITH_OP)
    (lt_HAVE_XSI_OPS): Set these without forking a test script when
    running under bash, to avoid a few unnecessary forks.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

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

Summary of changes:
 build-aux/general.m4sh |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/build-aux/general.m4sh b/build-aux/general.m4sh
index 252b2d2..e96c0e4 100644
--- a/build-aux/general.m4sh
+++ b/build-aux/general.m4sh
@@ -74,12 +74,21 @@ dirname='s|/[^/]*$||'
 basename='s|^.*/||'
 
 
+# We should try to minimise forks, especially on Windows where they are
+# unreasonably slow, so skip the feature probes when bash is being used:
+if test set = "${BASH_VERSION+set}"; then
+    : ${lt_HAVE_ARITH_OP="yes"}
+    : ${lt_HAVE_XSI_OPS="yes"}
+    # The += operator was introduced in bash 3.1
+    test -z "$lt_HAVE_PLUSEQ_OP" \
+      && test 3000 -lt "$((${BASH_VERSINFO[0]}*1000 + ${BASH_VERSINFO[1]}))" \
+      && lt_HAVE_PLUSEQ_OP=yes
+fi
+
+
 # lt_HAVE_PLUSEQ_OP
 # Can be empty, in which case the shell is probed, "yes" if += is useable
 # or anything else if += does not work.
-# NOTE: You can short-circuit the fork and test on every invocation (e.g.
-# on Windows where fork emulations are unreasonably slow) by setting this
-# in the environment of this script.
 test -z "$lt_HAVE_PLUSEQ_OP" \
     && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \
     && lt_HAVE_PLUSEQ_OP=yes
@@ -117,9 +126,6 @@ fi
 # lt_HAVE_ARITH_OP
 # Can be empty, in which case the shell is probed, "yes" if $((...)) is
 # useable or anything else if it does not work.
-# NOTE: You can short-circuit the fork and test on every invocation (e.g.
-# on Windows where fork emulations are unreasonably slow) by setting this
-# in the environment of this script.
 test -z "$lt_HAVE_ARITH_OP" \
     && (eval 'test 2 = $(( 1 + 1 ))') 2>/dev/null \
     && lt_HAVE_ARITH_OP=yes
@@ -141,9 +147,6 @@ fi
 # lt_HAVE_XSI_OPS
 # Can be empty, in which case the shell is probed, "yes" if XSI length
 # and matching operators are useable or anything else if they do not work.
-# NOTE: You can short-circuit the fork and test on every invocation (e.g.
-# on Windows where fork emulations are unreasonably slow) by setting this
-# in the environment of this script.
 test -z "$lt_HAVE_XSI_OPS" \
     && (eval 'x=a/b/c;
       test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Sun Dec 18 02:46:42 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RcBSE-0006hC-Jw
	for mharc-libtool-commit@gnu.org; Sun, 18 Dec 2011 02:46:42 -0500
Received: from eggs.gnu.org ([140.186.70.92]:57804)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RcBSB-0006gO-8u
	for libtool-commit@gnu.org; Sun, 18 Dec 2011 02:46:40 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RcBS9-0002rq-CK
	for libtool-commit@gnu.org; Sun, 18 Dec 2011 02:46:39 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:57013)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RcBS9-0002rm-Ag
	for libtool-commit@gnu.org; Sun, 18 Dec 2011 02:46:37 -0500
Received: from gary by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RcBS8-00083H-Pi
	for libtool-commit@gnu.org; Sun, 18 Dec 2011 07:46:36 +0000
Date: Sun, 18 Dec 2011 07:46:36 +0000
Message-Id: <E1RcBS8-00083H-Pi@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-142-g51c1877
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 4099c121a131784d3ab103bee848e971d8bfafcb
X-Git-Newrev: 51c1877e70cdf5ca617d7ff403c1ae740d8b3a40
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
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, 18 Dec 2011 07:46:41 -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  51c1877e70cdf5ca617d7ff403c1ae740d8b3a40 (commit)
      from  4099c121a131784d3ab103bee848e971d8bfafcb (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 51c1877e70cdf5ca617d7ff403c1ae740d8b3a40
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Sun Dec 18 14:32:40 2011 +0700

    bootstrap: adopt autoconf echo normalization code.
    
    Dash shipped with Ubutu-11.10 as /bin/sh, among others, still
    has a crippled echo builtin that mis-handles backslashes.
    * build-aux/options-parser (bs_echo): Adopt the autoconf echo
    normalization code to find a suitable replacement for buggy echo
    commands.
    Adjust all uses of echo to $bs_echo.
    * build-aux/extract-trace (func_extract_trace, func_main):
    Likewise.
    * bootstrap: To retain some execution speed on platforms with
    buggy builtin echo, replace most occurrences of `echo' with
    `$bs_echo' - except where its arguments will obviously never
    contain backslashes or be overly long.
    Reported by Reuben Thomas.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

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

Summary of changes:
 bootstrap                |   20 +++++++-------
 build-aux/extract-trace  |    8 +++---
 build-aux/options-parser |   60 ++++++++++++++++++++++++++++++++++++++-------
 3 files changed, 64 insertions(+), 24 deletions(-)

diff --git a/bootstrap b/bootstrap
index 147ac08..7b26d00 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1051,7 +1051,7 @@ func_require_buildreq_automake ()
 
       # ...and AM_INIT_AUTOMAKE is declared...
       test -n "$func_extract_trace_result" && {
-        automake_version=`echo "$func_extract_trace_result" \
+        automake_version=`$bs_echo "$func_extract_trace_result" \
            |$SED 's|[^0-9]*||; s| .*$||'`
         test -n "$automake_version" || automake_version=-
 
@@ -1798,8 +1798,8 @@ func_ifcontains ()
 {
     $debug_cmd
 
-    # The embedded echo is to squase whitespace before globbing.
-    _G_wslist=`echo " "$1" "`
+    # The embedded echo is to squash whitespace before globbing.
+    _G_wslist=`$bs_echo " "$1" "`
     _G_member=$2
     _G_yes_cmd=$3
     _G_no_cmd=${4-":"}
@@ -1833,7 +1833,7 @@ func_append_u ()
 {
     $debug_cmd
 
-    eval _G_current_value='`echo $'$1'`'
+    eval _G_current_value='`$bs_echo $'$1'`'
     _G_delim=`expr "$2" : '\(.\)'`
 
     case $_G_delim$_G_current_value$_G_delim in
@@ -1851,7 +1851,7 @@ func_strpad ()
     $debug_cmd
 
     _G_width=`expr "$2" - 1`
-    func_strpad_result=`echo "$1" |$SED '
+    func_strpad_result=`$bs_echo "$1" |$SED '
         :a
         s|^.\{0,'"$_G_width"'\}$|&'"$3"'|
         ta
@@ -1868,7 +1868,7 @@ func_strrpad ()
     $debug_cmd
 
     _G_width=`expr "$2" - 1`
-    func_strrpad_result=`echo "$1" |$SED '
+    func_strrpad_result=`$bs_echo "$1" |$SED '
         :a
         s|^.\{0,'"$_G_width"'\}$|'"$3"'&|
         ta
@@ -1953,7 +1953,7 @@ func_strtable ()
 
     # Strip off the indent, and make a divider with `-' chars, then
     # reindent.
-    _G_divider=`echo "$func_strrow_result" \
+    _G_divider=`$bs_echo "$func_strrow_result" \
         |$SED 's|[^ ]|-|g
             :a
             s|- |--|g
@@ -2111,8 +2111,8 @@ func_insert_sorted_if_absent ()
       func_grep_q "$str" "$file" \
           && func_verbose "inserting \`$str' into \`$file'"
 
-      echo "$str" |sort -u - "$file" |func_cmp_s - "$file" \
-        || echo "$str" |sort -u - "$file" -o "$file" \
+      $bs_echo "$str" |sort -u - "$file" |func_cmp_s - "$file" \
+        || $bs_echo "$str" |sort -u - "$file" -o "$file" \
         || func_permissions_error "$file"
     done
 }
@@ -2177,7 +2177,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=`echo '# extract version within line
+    sed_get_version=`$bs_echo '# extract version within line
           s|.*[v ]\{1,\}\([0-9]\{1,\}\.[.a-z0-9-]*\).*|\1|
           t done
 
diff --git a/build-aux/extract-trace b/build-aux/extract-trace
index b738257..ee3f284 100755
--- a/build-aux/extract-trace
+++ b/build-aux/extract-trace
@@ -254,8 +254,8 @@ func_extract_trace ()
     $require_configure_ac
     $require_gnu_m4
 
-    _G_m4_traces=`echo "--trace=$1" |$SED 's%,% --trace=%g'`
-    _G_re_macros=`echo "($1)" |$SED 's%,%|%g'`
+    _G_m4_traces=`$bs_echo "--trace=$1" |$SED 's%,% --trace=%g'`
+    _G_re_macros=`$bs_echo "($1)" |$SED 's%,%|%g'`
     _G_macros="$1"; shift
     test $# -gt 0 || {
       set dummy $configure_ac
@@ -357,7 +357,7 @@ func_extract_trace ()
 
     # Save the command pipeline results for further use by callers of
     # this function.
-    func_extract_trace_result=`echo "$_G_mini" \
+    func_extract_trace_result=`$bs_echo "$_G_mini" \
       |$M4 -daq --prefix $_G_m4_traces - "$@" 2>&1 1>/dev/null \
       |$SED -n -e "$_G_transform"`
 }
@@ -382,7 +382,7 @@ func_main ()
 
     # Display results.
     test -n "$func_extract_trace_result" \
-        && echo "$func_extract_trace_result"
+        && $bs_echo "$func_extract_trace_result"
 
     # The End.
     exit $EXIT_SUCCESS
diff --git a/build-aux/options-parser b/build-aux/options-parser
index 5d5d8ed..07a9731 100644
--- a/build-aux/options-parser
+++ b/build-aux/options-parser
@@ -173,6 +173,46 @@ basename='s|^.*/||'
 nl='
 '
 
+# 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.62)
+
+# 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
+
 # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
 # is ksh but when the shell is invoked as "sh" and the current value of
 # the _XPG environment variable is not equal to 1 (one), the special
@@ -181,7 +221,7 @@ nl='
 progpath=$0
 
 # The name of this program.
-progname=`echo "$progpath" |$SED "$basename"`
+progname=`$bs_echo "$progpath" |$SED "$basename"`
 
 
 ## ------------------------- ##
@@ -252,7 +292,7 @@ func_remove_hook ()
 {
     $debug_cmd
 
-    eval ${1}_hooks='`echo "\$'$1'_hooks" |$SED "s| '$2'||"`'
+    eval ${1}_hooks='`$bs_echo "\$'$1'_hooks" |$SED "s| '$2'||"`'
 }
 
 
@@ -541,7 +581,7 @@ func_echo ()
     IFS=$nl
     for _G_line in $_G_message; do
       IFS=$save_IFS
-      echo "$progname: $_G_line"
+      $bs_echo "$progname: $_G_line"
     done
     IFS=$save_IFS
 }
@@ -561,7 +601,7 @@ func_error ()
     IFS=$nl
     for _G_line in $_G_message; do
       IFS=$save_IFS
-      echo "$_G_prefix$tc_bold$_G_line$tc_reset" 1>&2
+      $bs_echo "$_G_prefix$tc_bold$_G_line$tc_reset" 1>&2
       _G_prefix="$progname:        "
     done
     IFS=$save_IFS
@@ -586,8 +626,8 @@ func_fatal_help ()
 {
     $debug_cmd
 
-    eval echo \""Usage: $usage"\"
-    eval echo \""$fatal_help"\"
+    eval $bs_echo \""Usage: $usage"\"
+    eval $bs_echo \""$fatal_help"\"
     func_error ${1+"$@"}
     exit $EXIT_FAILURE
 }
@@ -601,7 +641,7 @@ func_help ()
     $debug_cmd
 
     func_usage_message
-    echo "$long_help_message"
+    $bs_echo "$long_help_message"
     exit 0
 }
 
@@ -725,7 +765,7 @@ func_usage ()
     $debug_cmd
 
     func_usage_message
-    echo "Run \`$progname --help |${PAGER-more}' for full usage"
+    $bs_echo "Run \`$progname --help |${PAGER-more}' for full usage"
     exit 0
 }
 
@@ -737,11 +777,11 @@ func_usage_message ()
 {
     $debug_cmd
 
-    eval echo \""$usage"\"
+    eval $bs_echo \""$usage"\"
     echo
     $SED -n 's|^# ||;/^Written by/{x;p;x;};h' < "$progpath"
     echo
-    eval echo \""$usage_message"\"
+    eval $bs_echo \""$usage_message"\"
 }
 
 


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Fri Dec 23 21:44:02 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1ReHac-0003xT-8S
	for mharc-libtool-commit@gnu.org; Fri, 23 Dec 2011 21:44:02 -0500
Received: from eggs.gnu.org ([140.186.70.92]:50474)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1ReHaZ-0003x7-Q1
	for libtool-commit@gnu.org; Fri, 23 Dec 2011 21:44:01 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1ReHaY-0000Jm-Bq
	for libtool-commit@gnu.org; Fri, 23 Dec 2011 21:43:59 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:48552)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1ReHaY-0000Ji-6y
	for libtool-commit@gnu.org; Fri, 23 Dec 2011 21:43:58 -0500
Received: from gary by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1ReHaX-0003Mb-NP
	for libtool-commit@gnu.org; Sat, 24 Dec 2011 02:43:57 +0000
Date: Sat, 24 Dec 2011 02:43:57 +0000
Message-Id: <E1ReHaX-0003Mb-NP@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-145-g7a78cca
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 51c1877e70cdf5ca617d7ff403c1ae740d8b3a40
X-Git-Newrev: 7a78cca31bca68f3cf2e398d26b03f3980331d72
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
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, 24 Dec 2011 02:44:01 -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  7a78cca31bca68f3cf2e398d26b03f3980331d72 (commit)
       via  c8e9d169e19c457366d5237312ee6b9dbca2e4d7 (commit)
       via  eabd3ad629a8a7112c1bf58aeaf26dc79fbe0ce2 (commit)
      from  51c1877e70cdf5ca617d7ff403c1ae740d8b3a40 (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 7a78cca31bca68f3cf2e398d26b03f3980331d72
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Sat Dec 24 08:32:47 2011 +0700

    bootstrap: fix Autoconf version typo.
    
    * build-aux/options-parses: s/2\.62/2.68/
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

commit c8e9d169e19c457366d5237312ee6b9dbca2e4d7
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Sat Dec 24 08:30:12 2011 +0700

    gnulib: update gnulib submodule.
    
    Among others, this fixes the reference to a local commit.
    * gnulib: Updated to todays master HEAD revision.
    * gl/top/README-release.diff: Update to account for changes to
    gnulib/top/README-release since the last gnulib update.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

commit eabd3ad629a8a7112c1bf58aeaf26dc79fbe0ce2
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Sun Dec 18 20:41:10 2011 +0700

    libtool: make fork minimisation compatible with dash and zsh.
    
    * build-aub/general.m4sh (lt_HAVE_PLUSEQ_OP): Instead of using
    $((..)) arithmetic, which causes an error on dash, use a case
    based bash version check.
    (lt_HAVE_ARITH_OP, lt_HAVE_XSI_OPS): Also short circuit the
    feature probing forks and set these automatically when zsh is
    detected.
    Reported by Stefano Lattarini.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

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

Summary of changes:
 build-aux/general.m4sh     |   12 +++++++-----
 build-aux/options-parser   |    2 +-
 gl/top/README-release.diff |    8 ++++----
 gnulib                     |    2 +-
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/build-aux/general.m4sh b/build-aux/general.m4sh
index e96c0e4..3cfecee 100644
--- a/build-aux/general.m4sh
+++ b/build-aux/general.m4sh
@@ -75,14 +75,16 @@ basename='s|^.*/||'
 
 
 # We should try to minimise forks, especially on Windows where they are
-# unreasonably slow, so skip the feature probes when bash is being used:
-if test set = "${BASH_VERSION+set}"; then
+# unreasonably slow, so skip the feature probes when bash or zsh are
+# being used:
+if test set = "${BASH_VERSION+set}${ZSH_VERSION}"; then
     : ${lt_HAVE_ARITH_OP="yes"}
     : ${lt_HAVE_XSI_OPS="yes"}
     # The += operator was introduced in bash 3.1
-    test -z "$lt_HAVE_PLUSEQ_OP" \
-      && test 3000 -lt "$((${BASH_VERSINFO[0]}*1000 + ${BASH_VERSINFO[1]}))" \
-      && lt_HAVE_PLUSEQ_OP=yes
+    case $BASH_VERSION in
+      [12].* | 3.0 | 3.0.*) ;;
+      *)                    lt_HAVE_PLUSEQ_OP=yes ;;
+    esac
 fi
 
 
diff --git a/build-aux/options-parser b/build-aux/options-parser
index 07a9731..9d42418 100644
--- a/build-aux/options-parser
+++ b/build-aux/options-parser
@@ -176,7 +176,7 @@ nl='
 # 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.62)
+# (this code from Autoconf 2.68)
 
 # Printing a long string crashes Solaris 7 /usr/bin/printf.
 bs_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
diff --git a/gl/top/README-release.diff b/gl/top/README-release.diff
index 9f89724..4cc43f3 100644
--- a/gl/top/README-release.diff
+++ b/gl/top/README-release.diff
@@ -1,5 +1,5 @@
---- gnulib/top/README-release	2011-10-23 14:32:58.000000000 +0700
-+++ gl/top/README-release	2011-10-23 14:38:40.000000000 +0700
+--- gnulib/top/README-release	2011-12-24 08:28:59.000000000 +0700
++++ gl/top/README-release	2011-12-24 09:01:01.000000000 +0700
 @@ -1,5 +1,9 @@
  Here are most of the steps we (maintainers) follow when making a release.
  
@@ -10,11 +10,11 @@
  * start from a clean, up-to-date git directory.
  
      make -k maintainer-clean || { ./configure && make maintainer-clean; }
-@@ -18,12 +24,24 @@
+@@ -18,12 +22,24 @@
  
      http://hydra.nixos.org/jobset/gnu/@PACKAGE@-master
  
--* Run "./bootstrap && ./configure".  This downloads any new translations:
+-* Run "./bootstrap && ./configure".  This downloads any new translations.
 +* Double check that serial number updates in public m4 files weren't
 +  forgotten since last release (they should be updated in git along with
 +  commits that require it so that users can work with git snapshots).
diff --git a/gnulib b/gnulib
index f51babf..576e46c 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit f51babfaf400eb509f854cad509f5e649b9182b1
+Subproject commit 576e46cb89ee781ec9f8352723b5dc96d3c7fd1f


hooks/post-receive
-- 
GNU Libtool


