* ltmain.in [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 51778622e5b8c498b1f897cfc7602120b419a68b..0404a4857f68e64d1830193afc1336f1c249a426 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-03  Peter O'Gorman  <peter@pogma.com>
+
+       * ltmain.in [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>
 
        * ltmain.in, libtoolize.in: Exit with nonzero status on write failures

diff --git a/ltmain.in b/ltmain.in
index a1662f4859eed8cd5a9ef4808861b80e9fc922ff..1f37b6f9cde8891f26396031289700806427e9e8 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -2222,6 +2222,8 @@ EOF
        # it will not redefine variables installed, or shouldnotlink
        installed=yes
        shouldnotlink=no
+       avoidtemprpath=
+
 
        # Read the .la file
        case $lib in
@@ -2320,6 +2322,7 @@ EOF
            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"
@@ -2404,7 +2407,7 @@ EOF
          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
              *" $dir "*) ;;