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

and set to empty when using $LD for linking.  Fixes regression
introduced in 2004-12-20.
Reported by Ralf Menzel <menzel@ls6.cs.uni-dortmund.de> and
Пухальский Юрий Андреевич <pooh@cryptopro.ru>.

diff --git a/ChangeLog b/ChangeLog
index f17aaefb287dd005b77205b9508067cf6d1693dd..8f40461484edbc2a585a8ff4d79908bbdeb71f46 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-05-22  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * libtool.m4 (AC_LIBTOOL_PROG_LD_SHLIBS) [solaris]: Use ${wlarc}
+       and set to empty when using $LD for linking.  Fixes regression
+       introduced in 2004-12-20.
+       Reported by Ralf Menzel <menzel@ls6.cs.uni-dortmund.de> and
+       Пухальский Юрий Андреевич <pooh@cryptopro.ru>.
+
 2005-05-21  Gary V. Vaughan  <gary@gnu.org>,
            Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
@@ -27,7 +35,8 @@
        -Qoption between allextract/defaultextract.  The Sun C++ compiler
        bundles -Qoption arguments so convenience libraries are linked with
        defaultextract otherwise.
-       Backport of branch-2-0 patch dated 2004-03-14.
+       Backport of branch-2-0 patch dated 2004-03-14.  Reported by
+       Пухальский Юрий Андреевич <pooh@cryptopro.ru>.
 
 2005-03-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
@@ -2044,7 +2053,7 @@
 
        * libltdl/ltdl.c (foreach_dirinpath): Ensure that filename is '\0'
        terminated by all code paths.
-       Reported by Lutz Müller <lutz@users.sourceforge.net>
+       Reported by Lutz Müller <lutz@users.sourceforge.net>
 
 2002-06-20  Gary V. Vaughan  <gary@gnu.org>
 

diff --git a/libtool.m4 b/libtool.m4
index 4cc6f45e234ce018d929d910908137d66a0eb4d0..50ba6702a7512a92f9a9cf82c0a0261023affd01 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -5765,10 +5765,12 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
     solaris*)
       _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
       if test "$GCC" = yes; then
+       wlarc='${wl}'
        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
          $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
       else
+       wlarc=''
        _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
        $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
@@ -5778,7 +5780,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)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ;;
+       _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="${wlarc}-z ${wlarc}allextract\$convenience ${wlarc}-z ${wlarc}defaultextract" ;;
       esac
       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
       ;;