From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Mon, 28 Feb 2000 06:08:40 +0000 (+0000)
Subject: Even better use64bitall logic.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=843b3b0e3322db41698c3099017d3975ad483daa;p=p5sagit%2Fp5-mst-13.2.git

Even better use64bitall logic.

p4raw-id: //depot/cfgperl@5314
---

diff --git a/Configure b/Configure
index 66418e7..1341a6e 100755
--- a/Configure
+++ b/Configure
@@ -20,7 +20,7 @@
 
 # $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $
 #
-# Generated on Mon Feb 28 07:08:11 EET 2000 [metaconfig 3.0 PL70]
+# Generated on Mon Feb 28 08:07:01 EET 2000 [metaconfig 3.0 PL70]
 # (with additional metaconfig patches by perlbug@perl.com)
 
 cat >/tmp/c1$$ <<EOF
@@ -4298,7 +4298,6 @@ case "$uselfs" in
 	cat <<EOM >&4
 
 *** Configure -Duselfs is deprecated, using -Duselargefiles instead.
-
 EOM
 	uselargefiles="$define"
 	;;
@@ -4418,7 +4417,6 @@ case "$uselonglong" in
 	cat <<EOM >&4
 
 *** Configure -Duselonglong is deprecated, using -Duse64bitint instead.
-
 EOM
 	use64bitint="$define"
 	;;
@@ -4429,7 +4427,6 @@ case "$use64bits" in
 	cat <<EOM >&4
 
 *** Configure -Duse64bits is deprecated, using -Duse64bitint instead.
-
 EOM
 	use64bitint="$define"
 	;;
@@ -4440,7 +4437,6 @@ case "$use64bitints" in
 	cat <<EOM >&4
 
 *** There is no Configure -Duse64bitints, using -Duse64bitint instead.
-
 EOM
 	use64bitint="$define"
 	;;
@@ -4485,37 +4481,46 @@ eval $setvar
 
 case "$use64bitint" in
 "$define")	case "$longsize" in
-		4)	dflt='n'
-			cat <<EOM
-
-Since you have chosen 64-bitness you may want to try maximal 64-bitness.
-What you have chosen is minimal 64-bitness which means just enough
-to get 64-bit integers.  The maximal means using as much 64-bitness
-as is possible on the platform.  This in turn means even more binary
-incompatibilities.  On the other hand, your platform may not have
-any more maximal 64-bitness available than what you already have chosen.
-
-If this doesn't make any sense to you, just accept the default '$dflt'.
-EOM
-			rp='Try to use full 64-bit support, if available?'
-			. ./myread
-			case "$ans" in
-			[yY]*) val="$define" ;;
-			*)     val="$undef"  ;;
-			esac
-			;;
-		8) val="$define" ;;
-		*) val="$undef" ;;
+		8) dflt='y' ;;
+		*) dflt='n' ;;
 		esac
 		;;
 *)	case "$use64bitall" in
-	"$define"|true|[yY]*) val="$define" ;;
-	*) val="$undef" ;;
+	"$define"|true|[yY]*) dflt='y' ;;
+	*) dflt='n' ;;
 	esac
 	;;
 esac 
+cat <<EOM
+
+You may also choose to try maximal 64-bitness.  It means using as much
+64-bitness as possible on the platform.  This in turn means even more
+binary incompatibilities.  On the other hand, your platform may not
+have any more 64-bitness available than what you already have chosen.
+
+If this doesn't make any sense to you, just accept the default '$dflt'.
+EOM
+rp='Try to use maximal 64-bit support, if available?'
+. ./myread
+case "$ans" in
+[yY]*) val="$define" ;;
+*)     val="$undef"  ;;
+esac
 set use64bitall
 eval $setvar
+case "$use64bitall" in
+"$define")
+	case "$use64bitint" in
+	"$undef")
+		cat <<EOM
+
+Since you have chosen a maximally 64-bit build, I'm also turning on
+the use of 64-bit integers.
+EOM
+		use64bitint="$define" ;;
+	esac
+	;;
+esac
 
 case "$use64bitint" in
 "$define"|true|[yY]*)
@@ -4542,10 +4547,10 @@ esac
 case "$use64bitall" in
 "$define"|true|[yY]*)
 : Look for a hint-file generated 'call-back-unit'.  If the
-: user has specified that a full 64-bit perl is to be built,
+: user has specified that a maximally 64-bit perl is to be built,
 : we may need to set or change some other defaults.
 	if $test -f use64bitall.cbu; then
-		echo "Your platform has some specific hints for full 64-bit builds, using them..."
+		echo "Your platform has some specific hints for 64-bit builds, using them..."
 		. ./use64bitall.cbu
 	fi
 	case "$longsize" in