From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Fri, 3 Feb 2006 09:25:01 +0000 (+0000)
Subject: * libltdl/config/ltmain.m4sh (func_mode_link): Fix logic for
X-Git-Tag: release-2-1b~331
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e3fb346e54c1cce6747334d4771ad36aef28d41;p=thirdparty%2Flibtool.git

* 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 00cca8676..5834c0bca 100644
--- 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 f9ac29727..5a24b697b 100644
--- 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.