diff options
| author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2006-09-18 05:49:39 +0000 |
|---|---|---|
| committer | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2006-09-18 05:49:39 +0000 |
| commit | 786ef35a4ee092c13578372c46879fdf65599b6c (patch) | |
| tree | 3456c6d35008bb8dcbfa5ed5aac508d6f4199fea | |
| parent | 7eb81349b146e9892cd7b8d683c2d75676f2445e (diff) | |
| download | libtool-786ef35a4ee092c13578372c46879fdf65599b6c.tar.gz | |
* libltdl/m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER) [ linux ]
[k*bsd*-gnu ]: Fix brown paper bag: save and restore `libdir'.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | libltdl/m4/libtool.m4 | 6 |
2 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2006-09-18 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + + * libltdl/m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER) [ linux ] + [k*bsd*-gnu ]: Fix brown paper bag: save and restore `libdir'. + 2006-09-17 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> * tests/duplicate_deps.at: New file. Test circular depending diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4 index f35d14d5..399d49cc 100644 --- a/libltdl/m4/libtool.m4 +++ b/libltdl/m4/libtool.m4 @@ -2277,12 +2277,14 @@ linux* | k*bsd*-gnu) shlibpath_overrides_runpath=no # Some binutils ld are patched to set DT_RUNPATH save_LDFLAGS=$LDFLAGS - libdir=/foo wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) \ - eval LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\" + save_libdir=$libdir + eval libdir=/foo wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) \ + LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\" AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir"], [shlibpath_overrides_runpath=yes])]) LDFLAGS=$save_LDFLAGS + libdir=$save_libdir # This implies no fast_install, which is unacceptable. # Some rework will be needed to allow for fast_install |