From: Peter O'Gorman <peter@pogma.com>
Date: Thu, 3 Feb 2005 03:53:12 +0000 (+0000)
Subject: * config/ltmain.m4sh [darwin]: Don't add installed libs to
X-Git-Tag: release-2-1b~758
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c304c9d89df41137b7334485da3a0bf94c0eab9;p=thirdparty%2Flibtool.git

* config/ltmain.m4sh [darwin]: Don't add installed libs to
temp_rpath when building executables on darwin, or other systems
which use hardcode_automatic. It may break our wrapper scripts.
---

diff --git a/ChangeLog b/ChangeLog
index 73e210ced..560b90d9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-03  Peter O'Gorman  <peter@pogma.com>
+
+	* config/ltmain.m4sh [darwin]: Don't add installed libs to 
+	temp_rpath when building executables on darwin, or other systems
+	which use hardcode_automatic. It may break our wrapper scripts.
+
 2005-02-02  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* config/getopt.m4sh (func_version, func_usage, func_help,
diff --git a/config/ltmain.m4sh b/config/ltmain.m4sh
index a6afdaf43..1c407e44f 100644
--- a/config/ltmain.m4sh
+++ b/config/ltmain.m4sh
@@ -3397,6 +3397,8 @@ func_mode_link ()
 	# it will not redefine variables installed, or shouldnotlink
 	installed=yes
 	shouldnotlink=no
+	avoidtemprpath=
+
 
 	# Read the .la file
 	case $lib in
@@ -3508,6 +3510,7 @@ func_mode_link ()
 	    dir="$libdir"
 	    absdir="$libdir"
 	  fi
+	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
 	else
 	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
 	    dir="$ladir"
@@ -3598,7 +3601,7 @@ func_mode_link ()
 	  if test -n "$library_names" &&
 	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
 	    # We need to hardcode the library path
-	    if test -n "$shlibpath_var"; then
+	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
 	      # Make sure the rpath contains only unique directories.
 	      case "$temp_rpath " in
 	      *"$absdir:"*) ;;