From a677334311b34f4b1b8a75792f47f83dafaa991d Mon Sep 17 00:00:00 2001
From: Wilfredo Sanchez <wsanchez@apple.com>
Date: Sat, 16 Dec 2000 13:43:53 +0000
Subject: [PATCH] * ltconfig.in: (dyld/darwin*) Much improved port. *
 ltcf-c.sh: (dyld/darwin*) Much improved port. * libtool.m4: (dyld/darwin*)
 Much improved port. * ltmain.in: (dyld/darwin*) Much improved port.

---
 ChangeLog   |  7 +++++++
 libtool.m4  |  6 ++++++
 ltcf-c.sh   | 12 ++++++++++++
 ltconfig.in |  9 +++++++++
 4 files changed, 34 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 6c25b3627..60c7d626c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-12-16   Wilfredo Sanchez  <wsanchez@apple.com>
+
+	* ltconfig.in: (dyld/darwin*) Much improved port.
+	* ltcf-c.sh: (dyld/darwin*) Much improved port.
+	* libtool.m4: (dyld/darwin*) Much improved port.
+	* ltmain.in: (dyld/darwin*) Much improved port.
+	
 2000-12-16  Sascha Schumann <sascha@schumann.cx>
 
 	* ltmain.in: Accept darwin as an alias for rhapsody.
diff --git a/libtool.m4 b/libtool.m4
index 212e6af4e..2550cb285 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -537,6 +537,12 @@ cygwin* | mingw* |pw32*)
   lt_cv_file_magic_cmd='$OBJDUMP -f'
   ;;
 
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1`
+  ;;
+
 freebsd* )
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     case "$host_cpu" in
diff --git a/ltcf-c.sh b/ltcf-c.sh
index c8a8d7a84..0abfcdb04 100644
--- a/ltcf-c.sh
+++ b/ltcf-c.sh
@@ -167,6 +167,18 @@ EOF
       $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $lib '$ltdll_obj'$libobjs $deplibs $compiler_flags'
     ;;
 
+  darwin*|rhapsody*)
+    allow_undefined_flag='-undefined warning'
+    archive_cmds='$CC $(if [ "$module" = "yes" ]; then echo -bundle; else
+      echo -dynamiclib; fi) -o $lib $libobjs $deplibs $linkopts'
+    archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
+    ## What we need is to hardcode the path to the library, not the search path
+    #hardcode_direct=yes
+    #hardcode_libdir_flag_spec='-install_name $libdir/$lib'
+    hardcode_shlibpath_var=no
+    whole_archive_flag_spec='-all_load'
+    ;;
+
   netbsd*)
     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
       archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
diff --git a/ltconfig.in b/ltconfig.in
index f3053cd10..5e795d45f 100755
--- a/ltconfig.in
+++ b/ltconfig.in
@@ -999,6 +999,15 @@ cygwin* | mingw* | pw32*)
   lt_cv_dlopen_libs=
   ;;
 
+darwin* | rhapsody*)
+  library_names_spec='${libname}.`if [ "$module" = "yes" ]; then echo so; else echo dylib; fi`'
+  need_lib_prefix=no
+  need_version=no
+  postinstall_cmds='chmod +x $lib'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  ;;
+
 freebsd1*)
   dynamic_linker=no
   ;;
-- 
2.47.3