* 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 838321c9e8038bdf64d6e93a713d994f5f3f7922..395023065606dfcc950391ede567c62c6710ab23 100644 (file)
--- 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 f133594baadf11ece11321ac6000e5da96b693b4..b58efa4ca95a76b8d428e20c7ac080a742027a44 100644 (file)
--- a/config/ltmain.m4sh
+++ b/config/ltmain.m4sh
@@ -3370,6 +3370,8 @@ func_mode_link ()
        # it will not redefine variables installed, or shouldnotlink
        installed=yes
        shouldnotlink=no
+       avoidtemprpath=
+
 
        # Read the .la file
        case $lib in
@@ -3480,6 +3482,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"
@@ -3567,7 +3570,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:"*) ;;