X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=hints%2Fdarwin.sh;h=5bf23d2404da2a16c62c0021a8899147af6a7b67;hb=f9655257b2ff49a04bcf20c32c0590f5bc23526e;hp=a5e2c263dcb39c4a276bf33ee7afaac5fb28275d;hpb=69625aa92a91bf4ca9e0af8d5dd7d748e3cdd293;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/hints/darwin.sh b/hints/darwin.sh
index a5e2c26..5bf23d2 100644
--- a/hints/darwin.sh
+++ b/hints/darwin.sh
@@ -13,34 +13,27 @@ 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
-    ;;
+  ''|'/usr')
+	# Default install; use non-system directories
+	prefix='/usr/local'; # Built-in perl uses /usr
+	siteprefix=''/usr/local';
+	# Where to put modules.
+	sitelib="/Library/Perl/${version}"; # FIXME: Want "/Network/Perl/${version}" also
+	# 4BSD uses ${prefix}/share/man, not ${prefix}/man.
+	man1dir='/usr/share/man/man1';
+	man3dir='/usr/share/man/man3';
+	;;
+  *)	# Anything else; use non-system directories
+	;;
 esac
 
-# 4BSD uses ${prefix}/share/man, not ${prefix}/man.
-man1dir="${prefix}/share/man/man1";
-man3dir="${prefix}/share/man/man3";
-
 ##
 # Tool chain settings
 ##
@@ -71,7 +64,10 @@ esac
 
 # -pipe: makes compilation go faster.
 # -fno-common because common symbols are not allowed in MH_DYLIB
-ccflags="${ccflags} -pipe -fno-common"
+# -DDARWIN: 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 -DDARWIN"
 
 # At least on Darwin 1.3.x:
 #
@@ -118,29 +114,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