libtool--gary--1.0--patch-49

[Gary V. Vaughan]

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

Finally... it has taken me a week to track down the two bugs fixed
by this changeset and the next.  Without these fixes, it is impossible
to link CVS M4.

For the record M4 has about the most complicated linkage I know of in
any package:

  m4 application-------------------------------------.
    +-----> libm4.la dso                              \
              +-----> dlpreopened builtins             \
              +-----> dlopenable modules ---------------+-> gnulib.la dso
              |          +-----> e.g libgmp.la dso     /
              +-----> libltdl.la dso                  /
                         +------> dlpreopened loaders'

So libltdl is handling its own plugins, and libm4's!

This is a great stress test for libltdl, which can perform the link and
produce a working binary with these two changes...

Okay to commit?              
- -- 
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)

iD8DBQFBUfooFRMICSmD1gYRAnTGAKCSIla7ThKYYvKzEDLaY7AEi0MoTgCfQ7EN
p8u84q8RKOeBqrSU8OAQb38=
=2vZ0
-----END PGP SIGNATURE-----

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

* modified files

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

        * config/ltmain.in (func_mode_link): Propagate a convenience
        library's dependency libs correctly when it is being linked into a
        libtool library.

--- orig/config/ltmain.in
+++ mod/config/ltmain.in
@@ -3290,19 +3290,19 @@
            # It is a libtool convenience library, so add in its objects.
            convenience="$convenience $ladir/$objdir/$old_library"
            old_convenience="$old_convenience $ladir/$objdir/$old_library"
-           tmp_libs=
-           for deplib in $dependency_libs; do
-             deplibs="$deplib $deplibs"
-             if $opt_duplicate_deps ; then
-               case "$tmp_libs " in
-               *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-               esac
-             fi
-             tmp_libs="$tmp_libs $deplib"
-           done
          elif test "$linkmode" != prog && test "$linkmode" != lib; then
            func_fatal_error "\`$lib' is not a convenience library"
          fi
+         tmp_libs=
+         for deplib in $dependency_libs; do
+           deplibs="$deplib $deplibs"
+           if $opt_duplicate_deps ; then
+             case "$tmp_libs " in
+             *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+             esac
+           fi
+           tmp_libs="$tmp_libs $deplib"
+         done
          continue
        fi # $pass = conv