[SCM] GNU Libtool branch, master, updated. v2.2.10-175-gef56e98

[Charles Wilson]

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  ef56e98f3bb4ed780a08bced638f8adf673c0041 (commit)
      from  048979e10ffcbe67dad11e3b58365ecc66232e5a (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 ef56e98f3bb4ed780a08bced638f8adf673c0041
Author: Charles Wilson <address@hidden>
Date:   Sun Sep 12 09:19:51 2010 -0400

    When assigning $linklib value, honor [-all]-static[-libtool-libs]
    
    * libltdl/config/ltmain.m4sh (func_mode_link): When prefer_static_libs
    and static library exists, ensure old_library name is used as $linklib.
    Fixes failure on mingw when both static and shared libraries are
    present.
    
    Signed-off-by: Charles Wilson <address@hidden>

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

Summary of changes:
 ChangeLog                  |    9 +++++++++
 libltdl/config/ltmain.m4sh |   12 +++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b9abe8a..6b76340 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-12  Charles Wilson  <address@hidden>
+
+       When assigning $linklib value, honor [-all]-static[-libtool-libs]
+
+       * libltdl/config/ltmain.m4sh (func_mode_link): When prefer_static_libs
+       and static library exists, ensure old_library name is used as $linklib.
+       Fixes failure on mingw when both static and shared libraries are
+       present.
+
 2010-09-12  Ralf Wildenhues  <address@hidden>
 
        tests: work around zsh use of $options variable.
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 509a421..6036f4f 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -5652,9 +5652,15 @@ func_mode_link ()
 
        # Get the name of the library we link against.
        linklib=
-       for l in $old_library $library_names; do
-         linklib="$l"
-       done
+       if test -n "$old_library" &&
+          { test "$prefer_static_libs" = yes ||
+            test "$prefer_static_libs,$installed" = "built,no"; }; then
+         linklib=$old_library
+       else
+         for l in $old_library $library_names; do
+           linklib="$l"
+         done
+       fi
        if test -z "$linklib"; then
          func_fatal_error "cannot find name of link library for \`$lib'"
        fi


hooks/post-receive
-- 
GNU Libtool