From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sat, 12 Nov 2005 10:41:09 +0000 (+0000)
Subject: * libltdl/m4/libtool.m4 (LT_SYS_DLOPEN_SELF, _LT_COMPILER_PIC):
X-Git-Tag: release-2-1b~406
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=edef0a429706c7dfd34f63a40078adf9ab97798e;p=thirdparty%2Flibtool.git

* libltdl/m4/libtool.m4 (LT_SYS_DLOPEN_SELF, _LT_COMPILER_PIC):
Make sure `$wl' is properly expanded for tests involving
`export_dynamic_flag_spec', `lt_prog_compiler_static'.
---

diff --git a/ChangeLog b/ChangeLog
index 3576951eb..956d4f0c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,11 @@
 2005-11-12  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 
-	* tests/defs.m4sh (func_configure_nofail): Actually pass
-	options (like --disable-shared) to func_configure.
+	* libltdl/m4/libtool.m4 (LT_SYS_DLOPEN_SELF, _LT_COMPILER_PIC):
+	Make sure `$wl' is properly expanded for tests involving
+	`export_dynamic_flag_spec', `lt_prog_compiler_static'.
+
+	* tests/defs.m4sh (func_configure): Actually pass
+	options (like --disable-shared) to func_configure_nofail.
 
 2005-11-11  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index 09e8b10f2..0aff61616 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -1631,7 +1631,7 @@ else
     test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
 
     save_LDFLAGS="$LDFLAGS"
-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
 
     save_LIBS="$LIBS"
     LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -1644,7 +1644,7 @@ else
     ])
 
     if test "x$lt_cv_dlopen_self" = xyes; then
-      eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
       AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
     	  lt_cv_dlopen_self_static, [dnl
 	  _LT_TRY_DLOPEN_SELF(
@@ -3817,9 +3817,10 @@ _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
 #
 # Check to make sure the static flag actually works.
 #
-_LT_LINKER_OPTION([if $compiler static flag $_LT_TAGVAR(lt_prog_compiler_static, $1) works],
+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
+_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
   _LT_TAGVAR(lt_prog_compiler_static_works, $1),
-  $_LT_TAGVAR(lt_prog_compiler_static, $1),
+  $lt_tmp_static_flag,
   [],
   [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
 _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],