* libltdl/config/ltmain.m4sh (func_mode_link): 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 00cca86761ab8a1e869203ba014b57835bc507c2..5834c0bcaee1d698803717d44fa6ab41a0689b43 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-03  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * libltdl/config/ltmain.m4sh (func_mode_link): Fix logic for
+       adding run paths to also add paths for installed libtool
+       libraries in case `-static' is used.
+
 2006-02-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * Makefile.am (TESTSUITE_AT): List testsuite files in the order

diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index f9ac297274eabb9236b4cd24e381eb61e8282c0c..5a24b697bbda07e511d9dcca687dc5684a5196e2 100644 (file)
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -3594,7 +3594,9 @@ func_mode_link ()
 
        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.