From: Gary V. Vaughan <gary@gnu.org>
Date: Sat, 2 Oct 2004 15:56:20 +0000 (+0000)
Subject: * m4/libtool.m4 (hardcode_shlibpath_var) [darwin7*]: Revert my
X-Git-Tag: release-1-9d~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ba254ca061b2f5ddaae6ed486460f9ac36d3d59;p=thirdparty%2Flibtool.git

* m4/libtool.m4 (hardcode_shlibpath_var) [darwin7*]: Revert my
hack from 2004-09-30 now that I've removed /lib/hello.la and the
tests work properly for me again.
---

diff --git a/ChangeLog b/ChangeLog
index a42eacc37..52f9c41f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
-2004-09-23  Jim Tison  <jtison@us.ibm.com>
+2004-10-02  Gary V. Vaughan  <gary@gnu.org>
+
+	* m4/libtool.m4 (hardcode_shlibpath_var) [darwin7*]: Revert my
+	hack from 2004-09-30 now that I've removed /lib/hello.la and the
+	tests work properly for me again.
+
+2004-10-02  Jim Tison  <jtison@us.ibm.com>
 
 	Initial support for s390x-ibm-tpf:
 
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 48131892d..b1f3eb5bb 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -3818,28 +3818,25 @@ _LT_EOF
       ;;
 
     darwin* | rhapsody*)
-      case $host_os in
+      case "$host_os" in
         rhapsody* | darwin1.[[012]])
-          _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
-          ;;
-        *) # Darwin 1.3 on
-          case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
-            10.[[012]])
-              _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-              ;;
+         _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
+         ;;
+       *) # Darwin 1.3 on
+         case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
+           10.[[012]])
+             _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+             ;;
            10.*)
-              _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
-              ;;
-          esac
-          ;;
+             _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
+             ;;
+         esac
+         ;;
       esac
       _LT_TAGVAR(archive_cmds_need_lc, $1)=no
       _LT_TAGVAR(hardcode_direct, $1)=no
       _LT_TAGVAR(hardcode_automatic, $1)=yes
-      case $host_os in
-        darwin7.*) _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;;
-	*)         _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported ;;
-      esac
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
       _LT_TAGVAR(whole_archive_flag_spec, $1)=''
       _LT_TAGVAR(link_all_deplibs, $1)=yes
     if test "$GCC" = yes ; then