From MAILER-DAEMON Thu Sep 05 01:19:44 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VHRyq-0007E2-PC
	for mharc-libtool-commit@gnu.org; Thu, 05 Sep 2013 01:19:44 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:33980)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VHRyn-0007DQ-SQ
	for libtool-commit@gnu.org; Thu, 05 Sep 2013 01:19:42 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VHRym-0000wM-EU
	for libtool-commit@gnu.org; Thu, 05 Sep 2013 01:19:41 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:52254)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VHRym-0000wH-BS
	for libtool-commit@gnu.org; Thu, 05 Sep 2013 01:19:40 -0400
Received: from gary by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VHRyl-0008AK-NE
	for libtool-commit@gnu.org; Thu, 05 Sep 2013 05:19:39 +0000
Date: Thu, 05 Sep 2013 05:19:39 +0000
Message-Id: <E1VHRyl-0008AK-NE@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-393-g5d4a43d
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 2636f57059967d3438250234279edac7cfd13d35
X-Git-Newrev: 5d4a43d8747f71e677a1c8df574dc18036ff569d
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Sep 2013 05:19: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  5d4a43d8747f71e677a1c8df574dc18036ff569d (commit)
      from  2636f57059967d3438250234279edac7cfd13d35 (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 5d4a43d8747f71e677a1c8df574dc18036ff569d
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Thu Sep 5 12:16:25 2013 +0700

    maint: normalise formatting of recent commit log entry.
    
    * build-aux/git-log-fix: Add a summary line to ChangeLog entry of
    most recent commit.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

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

Summary of changes:
 build-aux/git-log-fix |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/build-aux/git-log-fix b/build-aux/git-log-fix
index 55eb597..5e1021a 100644
--- a/build-aux/git-log-fix
+++ b/build-aux/git-log-fix
@@ -2,6 +2,11 @@
 # option.  It specifies what changes to make to each given SHA1's commit
 # log and metadata, using Perl-eval'able expressions.
 
+2636f57059967d3438250234279edac7cfd13d35
+# Date:    Wed Sep 4 18:47:08 2013 -0700
+# Separate summary and file change description.
+s|(\* )|maint: add Brooks Moses to AUTHORS file.\n$1|
+
 8b6f961a68c73fc7d6c61ef9cd55ffa41dbbf028
 # Date:   Tue Jan  1 19:39:24 2013 +0100
 # No empty lines in a single commit.


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Thu Sep 05 12:29:16 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VHcQm-0003Ud-7x
	for mharc-libtool-commit@gnu.org; Thu, 05 Sep 2013 12:29:16 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:36693)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VHOhx-0002Ap-VO
	for libtool-commit@gnu.org; Wed, 04 Sep 2013 21:50:07 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VHOhw-0003kz-CO
	for libtool-commit@gnu.org; Wed, 04 Sep 2013 21:50:05 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:40126)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VHOhw-0003k8-99
	for libtool-commit@gnu.org; Wed, 04 Sep 2013 21:50:04 -0400
Received: from brooks by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VHOhu-0006nw-TR
	for libtool-commit@gnu.org; Thu, 05 Sep 2013 01:50:03 +0000
Date: Thu, 05 Sep 2013 01:50:03 +0000
Message-Id: <E1VHOhu-0006nw-TR@vcs.savannah.gnu.org>
From: "Brooks Moses" <bmoses@google.com>
To: libtool-commit@gnu.org
Subject: [SCM] GNU Libtool branch, master, updated. v2.4.2-392-g2636f57
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: ebeb8a62cd52a008a666bec1073cbbabb838acaf
X-Git-Newrev: 2636f57059967d3438250234279edac7cfd13d35
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-Mailman-Approved-At: Thu, 05 Sep 2013 12:29:15 -0400
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, 05 Sep 2013 01:50:07 -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  2636f57059967d3438250234279edac7cfd13d35 (commit)
      from  ebeb8a62cd52a008a666bec1073cbbabb838acaf (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 2636f57059967d3438250234279edac7cfd13d35
Author: Brooks Moses <bmoses@google.com>
Date:   Wed Sep 4 18:47:08 2013 -0700

    * AUTHORS: Add myself to committers list.

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

Summary of changes:
 AUTHORS |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 852c414..e88b687 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -28,6 +28,7 @@
     Peter Rosin			peda@lysator.liu.se
     Noah Misch			noah@cs.caltech.edu
     Charles Wilson		libtool@cwilson.fastmail.fm
+    Brooks Moses		bmoses@google.com
 -- 
   Copyright (C) 1996, 1998-2013 Free Software Foundation, Inc.
 


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Sun Sep 15 02:46:41 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VL66T-0002lc-BJ
	for mharc-libtool-commit@gnu.org; Sun, 15 Sep 2013 02:46:41 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:51675)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VL66P-0002kb-FD
	for libtool-commit@gnu.org; Sun, 15 Sep 2013 02:46:39 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VL66N-0007ml-MF
	for libtool-commit@gnu.org; Sun, 15 Sep 2013 02:46:37 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:34011)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VL66N-0007mh-IV
	for libtool-commit@gnu.org; Sun, 15 Sep 2013 02:46:35 -0400
Received: from gary by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VL66L-0004Bh-Tc
	for libtool-commit@gnu.org; Sun, 15 Sep 2013 06:46:34 +0000
Date: Sun, 15 Sep 2013 06:46:34 +0000
Message-Id: <E1VL66L-0004Bh-Tc@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-394-g96d8763
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 5d4a43d8747f71e677a1c8df574dc18036ff569d
X-Git-Newrev: 96d876301b0b1423e8192b6e54eba6a88569d14f
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 15 Sep 2013 06:46:39 -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  96d876301b0b1423e8192b6e54eba6a88569d14f (commit)
      from  5d4a43d8747f71e677a1c8df574dc18036ff569d (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 96d876301b0b1423e8192b6e54eba6a88569d14f
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Sun Sep 15 13:38:11 2013 +0700

    bootstrap: fetch defaults from gnulib-cache.m4 for non-imported projects.
    
    Recent changes uncovered some bugs in handling of gnulib-tool
    options for projects that check in gnulib-cache.m4 rather than
    keep a separate list of modules and options in bootstrap.conf.
    * gl/build-aux/bootstrap.in (func_require_doc_base)
    (func_require_gnulib_name, func_require_local_gl_dir): New
    functions to set defaults from gnulib-cache.m4 in projects that
    use gnulib-tool in --update mode.
    (func_require_gnulib_tool_base_options): Use them to fetch
    defaults.
    (func_require_gnulib_copy_cmd): New function to calculate the
    options required for gnlib-tool copy command.
    (func_gnulib_tool_copy_file): Simplify accordingly.
    (scriptversion): Bump.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

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

Summary of changes:
 bootstrap                 |  117 ++++++++++++++++++++++++++++++++++++++------
 gl/build-aux/bootstrap.in |  117 ++++++++++++++++++++++++++++++++++++++------
 2 files changed, 202 insertions(+), 32 deletions(-)

diff --git a/bootstrap b/bootstrap
index fec6f33..e123a8b 100755
--- a/bootstrap
+++ b/bootstrap
@@ -2203,7 +2203,7 @@ test extract-trace = "$progname" && func_main "$@"
 # End:
 
 # Set a version string for *this* script.
-scriptversion=2013-08-29.21; # UTC
+scriptversion=2013-09-15.06; # UTC
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -2766,13 +2766,9 @@ func_gnulib_tool_copy_file ()
 {
     $debug_cmd
 
-    $require_gnulib_path
     $require_gnulib_tool
     $require_patch
 
-    gnulib_copy_cmd="$gnulib_tool --copy-file"
-    $opt_copy || func_append gnulib_copy_cmd " --symlink"
-
     if test true = "$gnulib_tool"; then
       # If gnulib-tool is not available (e.g. bootstrapping in a
       # distribution tarball), make sure that at least we have some
@@ -2786,12 +2782,14 @@ or else specify the location of your 'git' binary by
 setting 'GIT' in the environment so that a fresh
 'gnulib' submodule can be cloned."
     else
-      test -f "$gnulib_path/$1" || {
+      $require_gnulib_copy_cmd
+
+      $gnulib_copy_cmd $1 $2 2>/dev/null || {
+        $require_gnulib_path
+
         func_error "'$gnulib_path/$1' does not exist"
         return 1
       }
-
-      $gnulib_copy_cmd $1 $2
     fi
 }
 
@@ -3325,6 +3323,8 @@ func_require_buildreq_patch ()
 {
     $debug_cmd
 
+    $require_local_gl_dir
+
     # This ensures PATCH is set appropriately by the time
     # func_check_versions enforces $buildreq.
     $require_patch
@@ -3400,6 +3400,28 @@ defaulting to '$copyright_holder'."
 }
 
 
+# require_doc_base
+# ----------------
+# Ensure doc_base has a sensible value, extracted from 'gnulib-cache.m4'
+# if possible, otherwise letting 'gnulib-tool' pick a default.
+require_doc_base=func_require_doc_base
+func_require_doc_base ()
+{
+    $debug_cmd
+
+    $require_gnulib_cache
+
+    test -f "$gnulib_cache" && test -z "$doc_base" && {
+      func_extract_trace_first "gl_DOC_BASE" "$gnulib_cache"
+      doc_base=$func_extract_trace_first_result
+
+      test -n "$doc_base" && func_verbose "doc_base='$doc_base'"
+    }
+
+    require_doc_base=:
+}
+
+
 # require_dotgitmodules
 # ---------------------
 # Ensure we have a '.gitmodules' file, with appropriate 'gnulib' settings.
@@ -3495,6 +3517,25 @@ func_require_gnulib_cache ()
 }
 
 
+# require_gnulib_copy_cmd
+# -----------------------
+# Only calculate the options for copying files with gnulib once.
+require_gnulib_copy_cmd=func_require_gnulib_copy_cmd
+func_require_gnulib_copy_cmd ()
+{
+    $debug_cmd
+
+    $require_gnulib_tool
+    $require_gnulib_tool_base_options
+
+    gnulib_copy_cmd="$gnulib_tool $gnulib_tool_base_options --copy-file"
+    $opt_copy || func_append gnulib_copy_cmd " --symlink"
+    $opt_quiet || func_append gnulib_copy_cmd " --verbose"
+
+    require_gnulib_copy_cmd=:
+}
+
+
 # require_gnulib_merge_changelog
 # ------------------------------
 # See if we can use gnulib's git-merge-changelog merge driver.
@@ -3533,10 +3574,9 @@ func_require_gnulib_mk ()
 {
     $debug_cmd
 
-    test -f "$gnulib_cache" && test -z "$gnulib_mk" && {
-      $require_gnulib_cache
-      $require_macro_dir
+    $require_gnulib_cache
 
+    test -f "$gnulib_cache" && test -z "$gnulib_mk" && {
       func_extract_trace_first "gl_MAKEFILE_NAME" "$gnulib_cache"
       gnulib_mk=$func_extract_trace_first_result
 
@@ -3547,6 +3587,28 @@ func_require_gnulib_mk ()
 }
 
 
+# require_gnulib_name
+# -------------------
+# Ensure gnulib_name has a sensible value, extracted from 'gnulib-cache.m4'
+# if possible, otherwise letting 'gnulib-tool' pick a default.
+require_gnulib_name=func_require_gnulib_name
+func_require_gnulib_name ()
+{
+    $debug_cmd
+
+    $require_gnulib_cache
+
+    test -f "$gnulib_cache" && test -z "$gnulib_name" && {
+      func_extract_trace_first "gl_LIB" "$gnulib_cache"
+      gnulib_name=$func_extract_trace_first_result
+
+      test -n "$gnulib_name" && func_verbose "gnulib_name='$gnulib_name'"
+    }
+
+    require_gnulib_name=:
+}
+
+
 # require_gnulib_path
 # require_gnulib_url
 # -------------------
@@ -3696,21 +3758,24 @@ func_require_gnulib_tool_base_options ()
     gnulib_tool_base_options=
 
     test true = "$gnulib_tool" || {
-      $require_build_aux
-      $require_macro_dir
-
       # 'gnulib_modules' and others are maintained in 'bootstrap.conf':
       # Use 'gnulib --import' to fetch gnulib modules.
+      $require_build_aux
       test -n "$build_aux" \
           && func_append_uniq gnulib_tool_base_options " --aux-dir=$build_aux"
+      $require_macro_dir
       test -n "$macro_dir" \
           && func_append_uniq gnulib_tool_base_options " --m4-base=$macro_dir"
+      $require_doc_base
       test -n "$doc_base" \
           && func_append_uniq gnulib_tool_base_options " --doc-base=$doc_base"
+      $require_gnulib_name
       test -n "$gnulib_name" \
           && func_append_uniq gnulib_tool_base_options " --lib=$gnulib_name"
+      $require_local_gl_dir
       test -n "$local_gl_dir" \
           && func_append_uniq gnulib_tool_base_options " --local-dir=$local_gl_dir"
+      $require_source_base
       test -n "$source_base" \
           && func_append_uniq gnulib_tool_base_options " --source-base=$source_base"
     }
@@ -3753,6 +3818,28 @@ func_require_libtoolize ()
 }
 
 
+# require_local_gl_dir
+# --------------------
+# Ensure local_gl_dir has a sensible value, extracted from 'gnulib-cache.m4'
+# if possible, otherwise letting 'gnulib-tool' pick a default.
+require_local_gl_dir=func_require_local_gl_dir
+func_require_local_gl_dir ()
+{
+    $debug_cmd
+
+    $require_gnulib_cache
+
+    test -f "$gnulib_cache" && test -z "$local_gl_dir" && {
+      func_extract_trace_first "gl_LOCAL_DIR" "$gnulib_cache"
+      local_gl_dir=$func_extract_trace_first_result
+
+      test -n "$local_gl_dir" && func_verbose "local_gl_dir='$local_gl_dir'"
+    }
+
+    require_local_gl_dir=:
+}
+
+
 # require_macro_dir
 # -----------------
 # Ensure that '$macro_dir' is set, and if it doesn't already point to an
@@ -3981,8 +4068,6 @@ func_require_source_base ()
     $require_gnulib_cache
 
     test -f "$gnulib_cache" && test -z "$source_base" && {
-      $require_macro_dir
-
       func_extract_trace_first "gl_SOURCE_BASE" "$gnulib_cache"
 
       source_base=$func_extract_trace_first_result
diff --git a/gl/build-aux/bootstrap.in b/gl/build-aux/bootstrap.in
index 4102144..e58cde5 100755
--- a/gl/build-aux/bootstrap.in
+++ b/gl/build-aux/bootstrap.in
@@ -13,7 +13,7 @@
 . `echo "$0" |${SED-sed} 's|[^/]*$||'`"extract-trace"
 
 # Set a version string for *this* script.
-scriptversion=2013-08-29.21; # UTC
+scriptversion=2013-09-15.06; # UTC
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -576,13 +576,9 @@ func_gnulib_tool_copy_file ()
 {
     $debug_cmd
 
-    $require_gnulib_path
     $require_gnulib_tool
     $require_patch
 
-    gnulib_copy_cmd="$gnulib_tool --copy-file"
-    $opt_copy || func_append gnulib_copy_cmd " --symlink"
-
     if test true = "$gnulib_tool"; then
       # If gnulib-tool is not available (e.g. bootstrapping in a
       # distribution tarball), make sure that at least we have some
@@ -596,12 +592,14 @@ or else specify the location of your 'git' binary by
 setting 'GIT' in the environment so that a fresh
 'gnulib' submodule can be cloned."
     else
-      test -f "$gnulib_path/$1" || {
+      $require_gnulib_copy_cmd
+
+      $gnulib_copy_cmd $1 $2 2>/dev/null || {
+        $require_gnulib_path
+
         func_error "'$gnulib_path/$1' does not exist"
         return 1
       }
-
-      $gnulib_copy_cmd $1 $2
     fi
 }
 
@@ -1135,6 +1133,8 @@ func_require_buildreq_patch ()
 {
     $debug_cmd
 
+    $require_local_gl_dir
+
     # This ensures PATCH is set appropriately by the time
     # func_check_versions enforces $buildreq.
     $require_patch
@@ -1210,6 +1210,28 @@ defaulting to '$copyright_holder'."
 }
 
 
+# require_doc_base
+# ----------------
+# Ensure doc_base has a sensible value, extracted from 'gnulib-cache.m4'
+# if possible, otherwise letting 'gnulib-tool' pick a default.
+require_doc_base=func_require_doc_base
+func_require_doc_base ()
+{
+    $debug_cmd
+
+    $require_gnulib_cache
+
+    test -f "$gnulib_cache" && test -z "$doc_base" && {
+      func_extract_trace_first "gl_DOC_BASE" "$gnulib_cache"
+      doc_base=$func_extract_trace_first_result
+
+      test -n "$doc_base" && func_verbose "doc_base='$doc_base'"
+    }
+
+    require_doc_base=:
+}
+
+
 # require_dotgitmodules
 # ---------------------
 # Ensure we have a '.gitmodules' file, with appropriate 'gnulib' settings.
@@ -1305,6 +1327,25 @@ func_require_gnulib_cache ()
 }
 
 
+# require_gnulib_copy_cmd
+# -----------------------
+# Only calculate the options for copying files with gnulib once.
+require_gnulib_copy_cmd=func_require_gnulib_copy_cmd
+func_require_gnulib_copy_cmd ()
+{
+    $debug_cmd
+
+    $require_gnulib_tool
+    $require_gnulib_tool_base_options
+
+    gnulib_copy_cmd="$gnulib_tool $gnulib_tool_base_options --copy-file"
+    $opt_copy || func_append gnulib_copy_cmd " --symlink"
+    $opt_quiet || func_append gnulib_copy_cmd " --verbose"
+
+    require_gnulib_copy_cmd=:
+}
+
+
 # require_gnulib_merge_changelog
 # ------------------------------
 # See if we can use gnulib's git-merge-changelog merge driver.
@@ -1343,10 +1384,9 @@ func_require_gnulib_mk ()
 {
     $debug_cmd
 
-    test -f "$gnulib_cache" && test -z "$gnulib_mk" && {
-      $require_gnulib_cache
-      $require_macro_dir
+    $require_gnulib_cache
 
+    test -f "$gnulib_cache" && test -z "$gnulib_mk" && {
       func_extract_trace_first "gl_MAKEFILE_NAME" "$gnulib_cache"
       gnulib_mk=$func_extract_trace_first_result
 
@@ -1357,6 +1397,28 @@ func_require_gnulib_mk ()
 }
 
 
+# require_gnulib_name
+# -------------------
+# Ensure gnulib_name has a sensible value, extracted from 'gnulib-cache.m4'
+# if possible, otherwise letting 'gnulib-tool' pick a default.
+require_gnulib_name=func_require_gnulib_name
+func_require_gnulib_name ()
+{
+    $debug_cmd
+
+    $require_gnulib_cache
+
+    test -f "$gnulib_cache" && test -z "$gnulib_name" && {
+      func_extract_trace_first "gl_LIB" "$gnulib_cache"
+      gnulib_name=$func_extract_trace_first_result
+
+      test -n "$gnulib_name" && func_verbose "gnulib_name='$gnulib_name'"
+    }
+
+    require_gnulib_name=:
+}
+
+
 # require_gnulib_path
 # require_gnulib_url
 # -------------------
@@ -1506,21 +1568,24 @@ func_require_gnulib_tool_base_options ()
     gnulib_tool_base_options=
 
     test true = "$gnulib_tool" || {
-      $require_build_aux
-      $require_macro_dir
-
       # 'gnulib_modules' and others are maintained in 'bootstrap.conf':
       # Use 'gnulib --import' to fetch gnulib modules.
+      $require_build_aux
       test -n "$build_aux" \
           && func_append_uniq gnulib_tool_base_options " --aux-dir=$build_aux"
+      $require_macro_dir
       test -n "$macro_dir" \
           && func_append_uniq gnulib_tool_base_options " --m4-base=$macro_dir"
+      $require_doc_base
       test -n "$doc_base" \
           && func_append_uniq gnulib_tool_base_options " --doc-base=$doc_base"
+      $require_gnulib_name
       test -n "$gnulib_name" \
           && func_append_uniq gnulib_tool_base_options " --lib=$gnulib_name"
+      $require_local_gl_dir
       test -n "$local_gl_dir" \
           && func_append_uniq gnulib_tool_base_options " --local-dir=$local_gl_dir"
+      $require_source_base
       test -n "$source_base" \
           && func_append_uniq gnulib_tool_base_options " --source-base=$source_base"
     }
@@ -1563,6 +1628,28 @@ func_require_libtoolize ()
 }
 
 
+# require_local_gl_dir
+# --------------------
+# Ensure local_gl_dir has a sensible value, extracted from 'gnulib-cache.m4'
+# if possible, otherwise letting 'gnulib-tool' pick a default.
+require_local_gl_dir=func_require_local_gl_dir
+func_require_local_gl_dir ()
+{
+    $debug_cmd
+
+    $require_gnulib_cache
+
+    test -f "$gnulib_cache" && test -z "$local_gl_dir" && {
+      func_extract_trace_first "gl_LOCAL_DIR" "$gnulib_cache"
+      local_gl_dir=$func_extract_trace_first_result
+
+      test -n "$local_gl_dir" && func_verbose "local_gl_dir='$local_gl_dir'"
+    }
+
+    require_local_gl_dir=:
+}
+
+
 # require_macro_dir
 # -----------------
 # Ensure that '$macro_dir' is set, and if it doesn't already point to an
@@ -1791,8 +1878,6 @@ func_require_source_base ()
     $require_gnulib_cache
 
     test -f "$gnulib_cache" && test -z "$source_base" && {
-      $require_macro_dir
-
       func_extract_trace_first "gl_SOURCE_BASE" "$gnulib_cache"
 
       source_base=$func_extract_trace_first_result


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Sun Sep 15 09:41:47 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VLCaB-00064D-Qe
	for mharc-libtool-commit@gnu.org; Sun, 15 Sep 2013 09:41:47 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:47343)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VLCa9-000646-LM
	for libtool-commit@gnu.org; Sun, 15 Sep 2013 09:41:46 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VLCa8-0002NB-Jl
	for libtool-commit@gnu.org; Sun, 15 Sep 2013 09:41:45 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:60820)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VLCa8-0002N7-Fo
	for libtool-commit@gnu.org; Sun, 15 Sep 2013 09:41:44 -0400
Received: from gary by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VLCZU-0008Tr-T6
	for libtool-commit@gnu.org; Sun, 15 Sep 2013 13:41:20 +0000
Date: Sun, 15 Sep 2013 13:41:07 +0000
Message-Id: <E1VLCZU-0008Tr-T6@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-395-g2d744d9
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 96d876301b0b1423e8192b6e54eba6a88569d14f
X-Git-Newrev: 2d744d9edab9819e15942d20e2f11fad14d8cbbb
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 15 Sep 2013 13:41: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  2d744d9edab9819e15942d20e2f11fad14d8cbbb (commit)
      from  96d876301b0b1423e8192b6e54eba6a88569d14f (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 2d744d9edab9819e15942d20e2f11fad14d8cbbb
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Sun Sep 15 20:35:15 2013 +0700

    bootstrap: make ensure_changelog work for update mode projects.
    
    * gl/build-aux/bootstrap.in (func_bootstrap): Move
    func_changelog_ensure invocation from here...
    (func_reconfigure): ...to here. If gnulib_modules is empty, then
    grep gnulib-cache.m4 for gitlog-to-changelog before invoking
    func_changelog_ensure.
    * bootstrap: Regenerate.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

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

Summary of changes:
 bootstrap                 |   17 +++++++++++++----
 gl/build-aux/bootstrap.in |   17 +++++++++++++----
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/bootstrap b/bootstrap
index e123a8b..803380a 100755
--- a/bootstrap
+++ b/bootstrap
@@ -2461,10 +2461,6 @@ func_bootstrap ()
     # Post-option preparation.
     func_prep
 
-    # Ensure ChangeLog presence.
-    func_ifcontains "$gnulib_modules" gitlog-to-changelog \
-      func_ensure_changelog
-
     # Reconfigure the package.
     func_reconfigure
 
@@ -2545,6 +2541,19 @@ func_reconfigure ()
 {
     $debug_cmd
 
+    # Ensure ChangeLog presence.
+    if test -n "$gnulib_modules"; then
+      func_ifcontains "$gnulib_modules" gitlog-to-changelog \
+        func_ensure_changelog
+    else
+      $require_gnulib_cache
+      if sed -n '/^gl_MODULES(\[/,/^])$/p' $gnulib_cache |
+         func_grep_q gitlog-to-changelog
+      then
+        func_ensure_changelog
+      fi
+    fi
+
     # Released 'autopoint' has the tendency to install macros that have
     # been obsoleted in current 'gnulib., so run this before 'gnulib-tool'.
     func_autopoint
diff --git a/gl/build-aux/bootstrap.in b/gl/build-aux/bootstrap.in
index e58cde5..550a642 100755
--- a/gl/build-aux/bootstrap.in
+++ b/gl/build-aux/bootstrap.in
@@ -271,10 +271,6 @@ func_bootstrap ()
     # Post-option preparation.
     func_prep
 
-    # Ensure ChangeLog presence.
-    func_ifcontains "$gnulib_modules" gitlog-to-changelog \
-      func_ensure_changelog
-
     # Reconfigure the package.
     func_reconfigure
 
@@ -355,6 +351,19 @@ func_reconfigure ()
 {
     $debug_cmd
 
+    # Ensure ChangeLog presence.
+    if test -n "$gnulib_modules"; then
+      func_ifcontains "$gnulib_modules" gitlog-to-changelog \
+        func_ensure_changelog
+    else
+      $require_gnulib_cache
+      if sed -n '/^gl_MODULES(\[/,/^])$/p' $gnulib_cache |
+         func_grep_q gitlog-to-changelog
+      then
+        func_ensure_changelog
+      fi
+    fi
+
     # Released 'autopoint' has the tendency to install macros that have
     # been obsoleted in current 'gnulib., so run this before 'gnulib-tool'.
     func_autopoint


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Mon Sep 16 00:05:42 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VLQ4E-0004oN-0X
	for mharc-libtool-commit@gnu.org; Mon, 16 Sep 2013 00:05:42 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:34340)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VLQ4B-0004o6-Eg
	for libtool-commit@gnu.org; Mon, 16 Sep 2013 00:05:40 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VLQ46-0001BH-KE
	for libtool-commit@gnu.org; Mon, 16 Sep 2013 00:05:39 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:53630)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VLQ46-0001BD-GV
	for libtool-commit@gnu.org; Mon, 16 Sep 2013 00:05:34 -0400
Received: from gary by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VLQ45-0002Sc-Ix
	for libtool-commit@gnu.org; Mon, 16 Sep 2013 04:05:34 +0000
Date: Mon, 16 Sep 2013 04:05:33 +0000
Message-Id: <E1VLQ45-0002Sc-Ix@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-396-g75051fb
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 2d744d9edab9819e15942d20e2f11fad14d8cbbb
X-Git-Newrev: 75051fb536aa3a84324f61253765ab0e58e91fa2
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Sep 2013 04:05:40 -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  75051fb536aa3a84324f61253765ab0e58e91fa2 (commit)
      from  2d744d9edab9819e15942d20e2f11fad14d8cbbb (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 75051fb536aa3a84324f61253765ab0e58e91fa2
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Mon Sep 16 11:02:23 2013 +0700

    bootstrap: clean up spurious 'gnulib-cache.m4 missing' error.
    
    * gl/build-aux/bootstrap.in (func_reconfigure): Don't show an
    error when running without gnulib-cache.m4.
    * bootstrap: Regenerate.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>

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

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

diff --git a/bootstrap b/bootstrap
index 803380a..2ad3eb9 100755
--- a/bootstrap
+++ b/bootstrap
@@ -2203,7 +2203,7 @@ test extract-trace = "$progname" && func_main "$@"
 # End:
 
 # Set a version string for *this* script.
-scriptversion=2013-09-15.06; # UTC
+scriptversion=2013-09-16.03; # UTC
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -2547,7 +2547,7 @@ func_reconfigure ()
         func_ensure_changelog
     else
       $require_gnulib_cache
-      if sed -n '/^gl_MODULES(\[/,/^])$/p' $gnulib_cache |
+      if sed -n '/^gl_MODULES(\[/,/^])$/p' $gnulib_cache 2>/dev/null |
          func_grep_q gitlog-to-changelog
       then
         func_ensure_changelog
diff --git a/gl/build-aux/bootstrap.in b/gl/build-aux/bootstrap.in
index 550a642..6463a6c 100755
--- a/gl/build-aux/bootstrap.in
+++ b/gl/build-aux/bootstrap.in
@@ -13,7 +13,7 @@
 . `echo "$0" |${SED-sed} 's|[^/]*$||'`"extract-trace"
 
 # Set a version string for *this* script.
-scriptversion=2013-09-15.06; # UTC
+scriptversion=2013-09-16.03; # UTC
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -357,7 +357,7 @@ func_reconfigure ()
         func_ensure_changelog
     else
       $require_gnulib_cache
-      if sed -n '/^gl_MODULES(\[/,/^])$/p' $gnulib_cache |
+      if sed -n '/^gl_MODULES(\[/,/^])$/p' $gnulib_cache 2>/dev/null |
          func_grep_q gitlog-to-changelog
       then
         func_ensure_changelog


hooks/post-receive
-- 
GNU Libtool


From MAILER-DAEMON Tue Sep 17 14:38:08 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VM0A3-0006Uz-Vo
	for mharc-libtool-commit@gnu.org; Tue, 17 Sep 2013 14:38:07 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:40358)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VM0A1-0006UJ-F8
	for libtool-commit@gnu.org; Tue, 17 Sep 2013 14:38:07 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VM09z-0003rN-Qc
	for libtool-commit@gnu.org; Tue, 17 Sep 2013 14:38:05 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:60825)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VM09z-0003rH-ML
	for libtool-commit@gnu.org; Tue, 17 Sep 2013 14:38:03 -0400
Received: from pekberg by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VM09y-0005pF-SH
	for libtool-commit@gnu.org; Tue, 17 Sep 2013 18:38:03 +0000
Date: Tue, 17 Sep 2013 18:38:02 +0000
Message-Id: <E1VM09y-0005pF-SH@vcs.savannah.gnu.org>
From: "Peter Rosin" <peda@lysator.liu.se>
To: libtool-commit@gnu.org
Subject: [SCM] GNU Libtool branch, master, updated. v2.4.2-397-g0ebb734
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 75051fb536aa3a84324f61253765ab0e58e91fa2
X-Git-Newrev: 0ebb734910bf56186dd0c0e84b1c8be507bad336
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: libtool-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU libtool shared library maintenance
	tool <libtool-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtool-commit>
List-Post: <mailto:libtool-commit@gnu.org>
List-Help: <mailto:libtool-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libtool-commit>,
	<mailto:libtool-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Sep 2013 18:38:07 -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  0ebb734910bf56186dd0c0e84b1c8be507bad336 (commit)
      from  75051fb536aa3a84324f61253765ab0e58e91fa2 (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 0ebb734910bf56186dd0c0e84b1c8be507bad336
Author: Peter Rosin <peda@lysator.liu.se>
Date:   Tue Sep 17 20:33:12 2013 +0200

    libtool: trust -print-search-dirs from recent GCC
    
    Alan Modra hints in [1] that -print-search-dirs was fixed in
    GCC 4.2(?), so that it nowadays automatically appends
    -print-multi-os-directory for the applicable directories. I.e.
    it should no longer be necessary for libtool to append a second
    ../lib64 when GCC has already done so. Also, the multi-os
    appending loop seems to have been added specifically for early
    (arguably broken) bi-arch enabled GCCs that printed -m32
    directories even though -m64 was the default [2]. So, my
    conclusion is that we want any libtool magic to affect
    -print-search-dirs output from contemporary GCCs as little as
    possible, while continuing to append the
    -print-multi-os-directory for the legacy case.
    
    Fixes bug#15321 reported by Ozkan Sezer.
    
    [1] http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20425
    [2] http://lists.gnu.org/archive/html/bug-libtool/2006-09/msg00019.html
    
    * m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER): If any of the
    directories printed by -print-search-dirs ends with the
    content of -print-multi-os-directory, then assume that
    GCC adds the multi-os-directory where appropriate all by
    itself and hence don't try to second guess when to add
    it manually.
    * THANKS: Update.

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

Summary of changes:
 THANKS        |    1 +
 m4/libtool.m4 |   17 ++++++++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/THANKS b/THANKS
index f49e5d9..3c30f61 100644
--- a/THANKS
+++ b/THANKS
@@ -152,6 +152,7 @@
   Nix				nix@esperi.org.uk
   Olaf Lenz			olenz@fias.uni-frankfurt.de
   Olly Betts			olly@muscat.co.uk
+  Ozkan Sezer			sezeroz@gmail.com
   Pádraig Brady			P@draigBrady.com
   Patrice Fromy			patrice.fromy@u-psud.fr
   Patrick Welche		prlw1@newn.cam.ac.uk
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 4418a1c..80d7e44 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -2233,13 +2233,20 @@ if test yes = "$GCC"; then
     ;;
   esac
   # Ok, now we have the path, separated by spaces, we can step through it
-  # and add multilib dir if necessary.
+  # and add multilib dir if necessary...
   lt_tmp_lt_search_path_spec=
-  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  # ...but if some path component already ends with the multilib dir we assume
+  # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
+  case "$lt_multi_os_dir; $lt_search_path_spec " in
+  "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
+    lt_multi_os_dir=
+    ;;
+  esac
   for lt_sys_path in $lt_search_path_spec; do
-    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-    else
+    if test -d "$lt_sys_path$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
+    elif test -n "$lt_multi_os_dir"; then
       test -d "$lt_sys_path" && \
 	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
     fi


hooks/post-receive
-- 
GNU Libtool


