libtool--gary--1.0--patch-27

[Gary V. Vaughan]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Gah!  Found a bug in --patch-26.  If 26 is okayed, I'll commit this
with it...

Cheers,
        Gary.
- -- 
Gary V. Vaughan      ())_.  address@hidden,gnu.org}
Research Scientist   ( '/   http://tkd.kicks-ass.net
GNU Hacker           / )=   http://www.gnu.org/software/libtool
Technical Author   `(_~)_   http://sources.redhat.com/autobook
_________________________________________________________
This patch notification generated by tlaapply version 0.5
http://tkd.kicks-ass.net/arch/address@hidden/cvs-utils--tla--1.0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.2 (Darwin)

iD8DBQFA7ouhFRMICSmD1gYRArSFAKC/3UWWEfs96ufpMBCzjhNUDQZoxwCfVIRC
mf6V5e7ggau/pq9ftCiLsno=
=KiFy
-----END PGP SIGNATURE-----

* looking for address@hidden/libtool--gary--1.0--patch-26 to compare with
* comparing to address@hidden/libtool--gary--1.0--patch-26
M  ChangeLog
M  ltmain.in

* modified files

Index: Changelog
from  Gary V. Vaughan  <address@hidden>

        * ltmain.in [darwin]: Don't try to link $old_library unless it
        exists, and $lib is a bundle.

--- orig/ltmain.in
+++ mod/ltmain.in
@@ -2785,16 +2785,18 @@
                  *-*-darwin* )
                    # if the lib is a (non-dlopened) module then we can not
                    # link against it, someone is ignoring the earlier warnings
-                   if test "X$dlopenmodule" == "X$lib"; then
-                     add="$dir/$old_library"
-                   elif /usr/bin/file -L $add 2> /dev/null |
+                   if /usr/bin/file -L $add 2> /dev/null |
                         $GREP "bundle" >/dev/null ; then
-                     $echo "*** Warning: lib $linklib is a module, not a 
shared library"
-                     if test -z "$old_library" ; then
-                       $echo
-                       $echo "*** And there doesn't seem to be a static 
archive available"
-                       $echo "*** The link will probably fail, sorry"
-                     else
+                     if test "X$dlopenmodule" != "X$lib"; then
+                       $echo "*** Warning: lib $linklib is a module, not a 
shared library"
+                       if test -z "$old_library" ; then
+                         $echo
+                         $echo "*** And there doesn't seem to be a static 
archive available"
+                         $echo "*** The link will probably fail, sorry"
+                       else
+                         add="$dir/$old_library"
+                       fi
+                     elif test -n "$old_library"; then
                        add="$dir/$old_library"
                      fi
                    fi