* libtool.m4 (AC_LIBTOOL_DLOPEN_SELF)

(AC_LIBTOOL_PROG_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 9e4554d24e25fc9d997a336cb09db696b9212ec0..974a48a586b06029a44bf55b05450b890970f4f1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-11-12  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+       * libtool.m4 (AC_LIBTOOL_DLOPEN_SELF)
+       (AC_LIBTOOL_PROG_COMPILER_PIC): Make sure `$wl' is properly
+       expanded for tests involving `export_dynamic_flag_spec',
+       `lt_prog_compiler_static'.
+
 2005-11-11  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 
        * libtool.m4 (AC_LIBTOOL_SYS_DYNAMIC_LINKER) [ freebsd ]:

diff --git a/libtool.m4 b/libtool.m4
index a542ad16141c472abb9de2de1a2092bdca234cdb..005e1eefcbebb34a4b3ee90f75b48a7838a804d2 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -965,7 +965,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"
@@ -5258,9 +5258,10 @@ esac
 #
 # Check to make sure the static flag actually works.
 #
-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works],
+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
+AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
   _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
-  $_LT_AC_TAGVAR(lt_prog_compiler_static, $1),
+  $lt_tmp_static_flag,
   [],
   [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
 ])