From: Kurt Zeilenga <kurt@openldap.org>
Date: Mon, 2 Oct 2000 23:22:18 +0000 (+0000)
Subject: Re-add Luke's changes to support Darwin (MacOS X beta)
X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~1829
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=11962a233f309857e351d6964c510c05a2df244e;p=openldap

Re-add Luke's changes to support Darwin (MacOS X beta)
---

diff --git a/build/ltconfig b/build/ltconfig
index c14d83c169..6f76f15da3 100755
--- a/build/ltconfig
+++ b/build/ltconfig
@@ -1,4 +1,5 @@
 #! /bin/sh
+# $OpenLDAP$
 
 # ltconfig - Create a system-specific libtool.
 # Copyright (C) 1996-1999 Free Software Foundation, Inc.
@@ -169,8 +170,8 @@ progname=`$echo "X$0" | $Xsed -e 's%^.*/%%'`
 # Constants:
 PROGRAM=ltconfig
 PACKAGE=libtool
-VERSION=1.3.5
-TIMESTAMP=" (1.385.2.206 2000/05/27 11:12:27)"
+VERSION=1.3.5+OpenLDAP
+TIMESTAMP=" (1.385.2.206 2000/10/02 14:18:00)"
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
 ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 rm="rm -f"
@@ -1367,6 +1368,17 @@ else
     hardcode_shlibpath_var=no
     ;;
 
+  darwin* | rhapsody*)
+    allow_undefined_flag='-undefined warning'
+    archive_cmds='$CC $(if [ "$module" = "yes" ]; then echo -bundle; else echo -dynamiclib -undefined suppress; 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'
+    ;;
+
   hpux9* | hpux10* | hpux11*)
     case "$host_os" in
     hpux9*) archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o $objdir/$soname $libobjs $deplibs $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib' ;;
@@ -1915,6 +1927,18 @@ freebsd*)
   esac
   ;;
 
+darwin* | rhapsody*)
+  deplibs_check_method='file_magic Mach-O dynamically linked shared library'
+  file_magic_cmd=/usr/bin/file
+  file_magic_test_file=`echo System/Library/Frameworks/System.framework/Versions/*/System | head -1`
+  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
+  ;;
+
 gnu*)
   version_type=linux
   need_lib_prefix=no
diff --git a/build/ltmain.sh b/build/ltmain.sh
index 766732da84..21c58150b6 100755
--- a/build/ltmain.sh
+++ b/build/ltmain.sh
@@ -1,5 +1,7 @@
 # ltmain.sh - Provide generalized library-building support services.
 # NOTE: Changing this file will not affect anything until you rerun ltconfig.
+# 
+# $OpenLDAP$
 #
 # Copyright (C) 1996-1999 Free Software Foundation, Inc.
 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
@@ -54,8 +56,8 @@ modename="$progname"
 # Constants.
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION=1.3.5
-TIMESTAMP=" (1.385.2.206 2000/05/27 11:12:27)"
+VERSION=1.3.5+OpenLDAP
+TIMESTAMP=" (1.385.2.206 2000/10/02 14:18:00)"
 
 default_mode=
 help="Try \`$progname --help' for more information."
@@ -1079,6 +1081,10 @@ compiler."
 	    # These systems don't actually have c library (as such)
 	    continue
 	    ;;
+          *-*-rhapsody* | *-*-darwin*)
+            # Darwin C library is in the System framework
+            deplibs="$deplibs -framework System"
+            ;;
 	  esac
 	elif test "$arg" = "-lm"; then
 	  case "$host" in
@@ -1086,6 +1092,10 @@ compiler."
 	    # These systems don't actually have math library (as such)
 	    continue
 	    ;;
+          *-*-rhapsody* | *-*-darwin*)
+            # Darwin math library is in the System framework
+            deplibs="$deplibs -framework System"
+            ;;
 	  esac
 	fi
 	deplibs="$deplibs $arg"