From: Gary V. Vaughan <gary@gnu.org>
Date: Sun, 5 Aug 2001 11:04:59 +0000 (+0000)
Subject: From Brad <brad@comstyle.com>:
X-Git-Tag: release-1-4d~81
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=12ed3e72d83f60f14f2ca2e827a2b188ae7c7182;p=thirdparty%2Flibtool.git

From Brad <brad@comstyle.com>:
* libtool.m4 (archive_cmds) [darwin, newsos, sysv4]: Replace
1.3 era $linkopts references with $linker_flags.
---

diff --git a/ChangeLog b/ChangeLog
index a599784a6..64698e5ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2001-08-05  Gary V. Vaughan  <gary@gnu.org>
 
+	From Brad <brad@comstyle.com>:
+	* libtool.m4 (archive_cmds) [darwin, newsos, sysv4]: Replace
+	1.3 era $linkopts references with $linker_flags.
+
 	* libltdl/ltdl.c:  Fixed several careless mistakes in the 
 	foreach_dirinpath support functions.
 	(foreach_dirinpath): Walk path elements with the argz API.
diff --git a/libtool.m4 b/libtool.m4
index e31565653..8fef47a19 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -4409,7 +4409,7 @@ EOF
       # FIXME: Relying on posixy $() will cause problems for
       #        cross-compilation, but unfortunately the echo tests do not
       #        yet detect zsh echo's removal of \ escapes.
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)'
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)'
       # We need to add '_' to the symbols in $export_symbols first
       #_LT_AC_TAGVAR(archive_expsym_cmds, $1)="$_LT_AC_TAGVAR(archive_cmds, $1)"' && strip -s $export_symbols'
       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
@@ -4743,7 +4743,7 @@ EOF
       ;;
   
     newsos6)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
@@ -4851,7 +4851,7 @@ EOF
   
     sysv4)
       if test "x$host_vendor" = xsni; then
-        _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linkopts'
+        _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linker_flags'
         _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
       else
         _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'