From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Mon, 18 Sep 2006 05:49:39 +0000 (+0000)
Subject: * libltdl/m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER) [ linux ]
X-Git-Tag: release-2-1b~242
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=786ef35a4ee092c13578372c46879fdf65599b6c;p=thirdparty%2Flibtool.git

* libltdl/m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER) [ linux ]
[k*bsd*-gnu ]: Fix brown paper bag: save and restore `libdir'.
---

diff --git a/ChangeLog b/ChangeLog
index 7a7c1e6d2..88c16e40c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 f35d14d50..399d49cc2 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