From: Gary V. Vaughan <gary@gnu.org>
Date: Thu, 6 Sep 2001 21:17:28 +0000 (+0000)
Subject: From Daniel Johnson <danielj7@mac.com>:
X-Git-Tag: release-1-4d~50
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bb480f7c43a3036ad25e152666491109b355cf75;p=thirdparty%2Flibtool.git

From Daniel Johnson <danielj7@mac.com>:
* libtool.m4 (AC_LIBTOOL_PROG_LD_SHLIBS) [darwin*]: Move from GNU
ld section to non-GNU ld section.
---

diff --git a/ChangeLog b/ChangeLog
index 1fcf2a1ee..7737c2677 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-09-06  Gary V. Vaughan  <gary@gnu.org>
+
+	From Daniel Johnson <danielj7@mac.com>:
+	* libtool.m4 (AC_LIBTOOL_PROG_LD_SHLIBS) [darwin*]: Move from GNU
+	ld section to non-GNU ld section.
+
 2001-09-05  Robert Boehne  <rboehne@ricardo-us.com>
 
 	* pdemo/Makefile.am (helldl):  Automake 1.4 can't find the target
diff --git a/libtool.m4 b/libtool.m4
index d54edddd5..b45c5128b 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -4434,27 +4434,6 @@ EOF
         $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags'
       ;;
 
-    darwin* | rhapsody*)
-      case "$host_os" in
-      rhapsody* | darwin1.[[012]])
-        _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
-        ;;
-      *) # Darwin 1.3 on
-        _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-        ;;
-      esac
-
-      # 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 "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $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
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
-      ;;
-
     netbsd*)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
         _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -4685,6 +4664,27 @@ EOF
       fix_srcfile_path='`cygpath -w "$srcfile"`'
       ;;
 
+    darwin* | rhapsody*)
+      case "$host_os" in
+      rhapsody* | darwin1.[[012]])
+        _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
+        ;;
+      *) # Darwin 1.3 on
+        _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
+        ;;
+      esac
+
+      # 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 "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $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
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+      ;;
+
     dgux*)
       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'