* config/ltmain.in (func_mode_link): Propagate a convenience

library's dependency libs correctly when it is being linked into a
libtool library.  Deplibs are now propagated whether libdir is set
or not.

diff --git a/ChangeLog b/ChangeLog
index 95169080db374fc68ef154eb66f5261888b7e808..47f96afe81776756c3470c5ee067bde171745204 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-09-22  Gary V. Vaughan  <gary@gnu.org>
+
+       * config/ltmain.in (func_mode_link): Propagate a convenience
+       library's dependency libs correctly when it is being linked into a
+       libtool library.  Deplibs are now propagated whether libdir is set
+       or not.
+
 2004-09-22  Andreas Schwab  <schwab@suse.de>
 
        The dlpreopen pass over libraries reverses the elements in the

diff --git a/config/ltmain.in b/config/ltmain.in
index dfe41b45418e43686db4f68a434d4dae6fedf0d4..43846d28fd673492e61f890a93e64bec9d261770 100644 (file)
--- a/config/ltmain.in
+++ b/config/ltmain.in
@@ -3618,19 +3618,19 @@ func_mode_link ()
            # 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