From ea4dde01ae5d18a13a0286d07f42fd0b7597e011 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Fri, 3 Feb 2006 09:25:56 +0000 Subject: [PATCH] * ltmain.in (link mode): Fix logic for adding run paths to also add paths for installed libtool libraries in case `-static' is used. --- ChangeLog | 6 ++++++ ltmain.in | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 727f7cfd1..54db631e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-02-03 Ralf Wildenhues + + * 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 * doc/libtool.texi (titlepage): Remove superfluous word. diff --git a/ltmain.in b/ltmain.in index bb96ac7e6..d9503d194 100644 --- 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. -- 2.47.3