* libtool.m4 [solaris] (AC_LIBTOOL_PROG_LD_SHLIBS): Use ${wl} for

whole_archive_flag_spec.  Missing backport reported by Ralf Menzel
<menzel@ls6.cs.uni-dortmund.de>.

diff --git a/ChangeLog b/ChangeLog
index 47f1ff983c5539f5b9291cfd6ff643ef80db3e7a..54329dea2a276df2371d804fa3eea00cc96f8966 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
 2004-12-20  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+       
+       * libtool.m4 [solaris] (AC_LIBTOOL_PROG_LD_SHLIBS): Use ${wl} for
+       whole_archive_flag_spec.  Missing backport reported by Ralf Menzel
+       <menzel@ls6.cs.uni-dortmund.de>.
 
        * tests/demo-nopic.test [solaris, sunos]: Skip test.
 

diff --git a/libtool.m4 b/libtool.m4
index 6870a870bf9feb7a315606b8c6fefa8a2497204b..8ce84fadd46a38549d8ce93f0e1708c4b7ccb91b 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -5737,7 +5737,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
       case $host_os in
       solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
       *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-       _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
+       _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ;;
       esac
       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
       ;;