No ODBM for Mac OS X, even if we have Fink GDBM libraries.

[perl5.git] / hints / darwin.sh

diff --git a/hints/darwin.sh b/hints/darwin.sh
index a5e2c26..6d2c112 100644 (file)
--- a/hints/darwin.sh
+++ b/hints/darwin.sh
@@ -13,34 +13,48 @@ perl_version=`awk '/define[         ]+PERL_VERSION/ {print $3}' $src/patchlevel.h`
 perl_subversion=`awk '/define[         ]+PERL_SUBVERSION/ {print $3}' $src/patchlevel.h`
 version="${perl_revision}.${perl_version}.${perl_subversion}"
 
+# This was previously used in all but causes three cases
+# (no -Ddprefix=, -Dprefix=/usr, -Dprefix=/some/thing/else)
+# but that caused too much grief.
+# vendorlib="/System/Library/Perl/${version}"; # Apple-supplied modules
+
 # BSD paths
 case "$prefix" in
-  '')
-    # Default install; use non-system directories
-    prefix='/usr/local'; # Built-in perl uses /usr
-    siteprefix='/usr/local';
-    vendorprefix='/usr'; usevendorprefix='define';
-
-    # Where to put modules.
-    sitelib="/Library/Perl/${version}"; # FIXME: Want "/Network/Perl/${version}" also
-    vendorlib="/System/Library/Perl/${version}"; # Apple-supplied modules
-    ;;
-
-  '/usr')
-    # We are building/replacing the built-in perl
-    siteprefix='/usr/local';
-    vendorprefix='/usr/local'; usevendorprefix='define';
-
-    # Where to put modules.
-    sitelib="/Library/Perl/${version}"; # FIXME: Want "/Network/Perl/${version}" also
-    vendorlib="/System/Library/Perl/${version}"; # Apple-supplied modules
-    ;;
+'')    # Default install; use non-system directories
+       prefix='/usr/local';
+       siteprefix='/usr/local';
+       ;;
+'/usr')        # We are building/replacing the built-in perl
+       prefix='/';
+       installprefix='/';
+       bin='/usr/bin';
+       siteprefix='/usr/local';
+       # We don't want /usr/bin/HEAD issues.
+       sitebin='/usr/local/bin';
+       sitescript='/usr/local/bin';
+       installusrbinperl='define'; # You knew what you were doing.
+       privlib="/System/Library/Perl/${version}";
+       sitelib="/Library/Perl/${version}";
+       vendorprefix='/';
+       usevendorprefix='define';
+       vendorbin='/usr/bin';
+       vendorscript='/usr/bin';
+       vendorlib="/Network/Library/Perl/${version}";
+       # 4BSD uses ${prefix}/share/man, not ${prefix}/man.
+       man1dir='/usr/share/man/man1';
+       man3dir='/usr/share/man/man3';
+       # But users' installs shouldn't touch the system man pages.
+       # Transient obsoleted style.
+       siteman1='/usr/local/share/man/man1';
+       siteman3='/usr/local/share/man/man3';
+       # New style.
+       siteman1dir='/usr/local/share/man/man1';
+       siteman3dir='/usr/local/share/man/man3';
+       ;;
+  *)   # Anything else; use non-system directories, use Configure defaults
+       ;;
 esac
 
-# 4BSD uses ${prefix}/share/man, not ${prefix}/man.
-man1dir="${prefix}/share/man/man1";
-man3dir="${prefix}/share/man/man3";
-
 ##
 # Tool chain settings
 ##
@@ -71,7 +85,10 @@ esac
 
 # -pipe: makes compilation go faster.
 # -fno-common because common symbols are not allowed in MH_DYLIB
-ccflags="${ccflags} -pipe -fno-common"
+# -DPERL_DARWIN: apparently the __APPLE__ is not sanctioned by Apple
+# as the way to differentiate Mac OS X.  (The official line is that
+# *no* cpp symbol does differentiate Mac OS X.)
+ccflags="${ccflags} -pipe -fno-common -DPERL_DARWIN"
 
 # At least on Darwin 1.3.x:
 #
@@ -118,29 +135,36 @@ dlext='bundle';
 dlsrc='dl_dyld.xs'; usedl='define';
 cccdlflags=' '; # space, not empty, because otherwise we get -fpic
 # Perl bundles do not expect two-level namespace, added in Darwin 1.4.
+# But starting from perl 5.8.1/Darwin 7 the default is the two-level.
 case "$osvers" in
 1.[0-3].*)
-  lddlflags="${ldflags} -bundle -undefined suppress"
-  ;;
-1.*|[2-6].*)
-  ldflags="${ldflags} -flat_namespace"
-  lddlflags="${ldflags} -bundle -undefined suppress"
-  ;;
-*)
-  lddlflags="${ldflags} -bundle -undefined dynamic_lookup"
-  case "$ld" in
-  *MACOSX_DEVELOPMENT_TARGET*) ;;
-  *) ld="MACOSX_DEPLOYMENT_TARGET=10.3 ${ld}" ;;
-  esac
+   lddlflags="${ldflags} -bundle -undefined suppress"
+   ;;
+1.*)
+   ldflags="${ldflags} -flat_namespace"
+   lddlflags="${ldflags} -bundle -undefined suppress"
+   ;;
+[2-6].*)
+   ldflags="${ldflags} -flat_namespace"
+   lddlflags="${ldflags} -bundle -undefined suppress"
+   ;;
+*) lddlflags="${ldflags} -bundle -undefined dynamic_lookup"
+   case "$ld" in
+   *MACOSX_DEVELOPMENT_TARGET*) ;;
+   *) ld="MACOSX_DEPLOYMENT_TARGET=10.3 ${ld}" ;;
+   esac
+   ;;
 esac
 ldlibpthname='DYLD_LIBRARY_PATH';
-useshrplib='true';
+
+# useshrplib=true results in much slower startup times.
+# 'false' is the default value.  Use Configure -Duseshrplib to override.
 
 cat > UU/archname.cbu <<'EOCBU'
 # This script UU/archname.cbu will get 'called-back' by Configure 
 # after it has otherwise determined the architecture name.
 case "$ldflags" in
-*"-flat_namespace"*) ;; # Backward compat.
+*"-flat_namespace"*) ;; # Backward compat, be flat.
 # If we are using two-level namespace, we will munge the archname to show it.
 *) archname="${archname}-2level" ;;
 esac
@@ -153,8 +177,10 @@ EOCBU
 # vfork works
 usevfork='true';
 
-# malloc works
-usemymalloc='n';
+# our malloc works (but allow users to override)
+case "$usemymalloc" in
+'') usemymalloc='n' ;;
+esac
 
 # Locales aren't feeling well.
 LC_ALL=C; export LC_ALL;
@@ -183,6 +209,11 @@ EOM
 
 esac
 
+# Fink can install a GDBM library that claims to have the ODBM interfaces
+# but Perl dynaloader cannot for some reason use that library.  We don't
+# really need ODBM_FIle, though, so let's just hint ODBM away.
+i_dbm=undef;
+
 ##
 # Build process
 ##