* ltmain.in (link mode): Fix logic for adding run paths to

also add paths for installed libtool libraries in case
`-static' is used.

diff --git a/ChangeLog b/ChangeLog
index 727f7cfd180481a548574c21f478f4f2391929f8..54db631e39f3e58aa99efa5f8b4bff7b27807bf5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-03  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * ltmain.in (link mode): Fix logic for adding run paths to
+       also add paths for installed libtool libraries in case
+       `-static' is used.
+
 2006-01-30  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * doc/libtool.texi (titlepage): Remove superfluous word.

diff --git a/ltmain.in b/ltmain.in
index bb96ac7e6c358fc2912d39fc7aed46f4486cea31..d9503d194252383ee879546e88f59ed9e9ba5dbb 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -2497,7 +2497,9 @@ EOF
 
        if test "$linkmode,$pass" = "prog,link"; then
          if test -n "$library_names" &&
-            { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+            { { test "$prefer_static_libs" = no ||
+                test "$prefer_static_libs,$installed" = "built,yes"; } ||
+              test -z "$old_library"; }; then
            # We need to hardcode the library path
            if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
              # Make sure the rpath contains only unique directories.