* ltmain.in: Make sure that dependency libraries of -dlpreopened

libraries are propogated properly.

diff --git a/ChangeLog b/ChangeLog
index 70a4d9f74f5fc30457f169a10b64d6aadfc1cc1f..05c7bb0ea156cc83deaea484682a401222a84a67 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,15 +1,20 @@
+2004-07-25  Gary V. Vaughan  <gary@gnu.org>
+
+       * ltmain.in: Make sure that dependency libraries of -dlpreopened
+       libraries are propogated properly.
+
 2004-07-23  Joe Orton  <joe@manyfish.co.uk>
 
-       * libtool.m4: Treat bsdi5* like bsdi4*. 
+       * libtool.m4: Treat bsdi5* like bsdi4*.
 
 2004-07-22  Peter O'Gorman  <peter@pogma.com>
 
        * ltmain.in [darwin](func_extract_archives): $SED not sed.
-       
+
        * ltmain.in [darwin](func_extract_archives): Clean up last commit
        a little, some suggestions are from Albert Chin, those that are
        broken are mine.
-       
+
        * libltdl/Makefile.am, libltdl/loaders/Makefile.am: Look for
        included files in the right places.
 
@@ -29,7 +34,7 @@
 2004-07-18  Peter O'Gorman  <peter@pogma.com>
 
        * libltdl/Makefile.am: Ensure that lt__dirent.h is part of the dist,
-       also make failed looking for configure.ac, look for 
+       also make failed looking for configure.ac, look for
        $(top_srcdir)/configure.ac instead.
 
 2004-07-15  Gary V. Vaughan  <gary@gnu.org>

diff --git a/configure.ac b/configure.ac
index 73a1b68489b7ed5bc7696f13c343421b4a846248..c920fe1a5db7835ee29ee50a08744e5eb1868d90 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ AC_PREREQ(2.58) ## We use AS_HELP_STRING
 ## ------------------------ ##
 ## Autoconf initialisation. ##
 ## ------------------------ ##
-AC_INIT([libtool], [1.5a], [bug-libtool@gnu.org])
+AC_INIT([libtool], [1.5b], [bug-libtool@gnu.org])
 AC_CONFIG_HEADERS([config.h:config-h.in])
 AC_CONFIG_SRCDIR([ltmain.in])
 AC_CONFIG_AUX_DIR([config])

diff --git a/ltmain.in b/ltmain.in
index 88045efb7bd3a9d906d98c6a2a3d4ceb649450c4..aedcd4a289f70ea16545f31d2ceb883867370139 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -2232,6 +2232,20 @@ EOF
        esac
       fi
       if test "$linkmode,$pass" = "lib,dlpreopen"; then
+        # Collect and forward deplibs of preopened libtool libs
+       for lib in $dlprefiles; do
+         # Ignore non-libtool-libs
+         case $lib in
+         */*.la | *\\*.la)
+           . $lib
+           deplibs="$deplibs $dependency_libs"
+           ;;
+         *.la)
+           . ./$lib
+           deplibs="$deplibs $dependency_libs"
+           ;;
+         esac
+       done
        libs="$dlprefiles"
       fi
       if test "$pass" = dlopen; then