From: Gary V. Vaughan <gary@gnu.org>
Date: Thu, 30 Sep 2004 20:53:17 +0000 (+0000)
Subject: * m4/libtool.m4 (hardcode_shlibpath_var) [darwin7]: My Panther
X-Git-Tag: release-1-9d~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8fc94cdab295f49c78a84e691ead21a79e680b17;p=thirdparty%2Flibtool.git

* m4/libtool.m4 (hardcode_shlibpath_var) [darwin7]: My Panther
workstation doesn't hardcode the shared library path, although it
used to, so this is more likely a function of the binutils and/or
gcc I am using at the moment.  The hardcode value setting code for
the configure script sucks at the moment though...
* (TODO): ...and needs to do a test compile instead of a table
lookup before 2.0 final.
---

diff --git a/ChangeLog b/ChangeLog
index f3b6387c4..ac21669e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2004-09-30  Gary V. Vaughan  <gary@gnu.org>
 
+	* m4/libtool.m4 (hardcode_shlibpath_var) [darwin7]: My Panther
+	workstation doesn't hardcode the shared library path, although it
+	used to, so this is more likely a function of the binutils and/or
+	gcc I am using at the moment.  The hardcode value setting code for
+	the configure script sucks at the moment though...
+	* (TODO): ...and needs to do a test compile instead of a table
+	lookup before 2.0 final.
+
 	* m4/libtool.m4 (echo): Use ECHO throughout for consistency with
 	config/ltmain.in.
 	Reported by Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
diff --git a/TODO b/TODO
index 17a992abf..b7855e204 100644
--- a/TODO
+++ b/TODO
@@ -7,9 +7,9 @@ GNU Libtool
 1.1. libtool
 ------------
 
-* Factor common shell preamble and function definitions into a separate
-  file and substitute the contents into all of our shell scripts at
-  bootstrap, to avoid any synchronisation issues.
+* Rather than looking up the linker's hardcode characteristics in a
+  table of shell code, use objdump or equivalent to probe a test program
+  at configure time.
 
 * Eliminate the warnings from autoconf -Wobsolete.
 
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 826992efd..508bee378 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -3803,25 +3803,28 @@ _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
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+      case $host_os in
+        darwin7.*) _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;;
+	*)         _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported ;;
+      esac
       _LT_TAGVAR(whole_archive_flag_spec, $1)=''
       _LT_TAGVAR(link_all_deplibs, $1)=yes
     if test "$GCC" = yes ; then