Undo change #2581.

p4raw-link: @2581 on //depot/cfgperl: 5a411a32e4c18cbe40a6ed1a4de4dafa8a4c0d7a

p4raw-id: //depot/cfgperl@2589

1 files changed, 64 insertions, 14 deletions

diff --git a/Configure b/Configure
index 1dc7bae4eb..ae1b4f4f56 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 Thu Jan  7 13:54:35 EET 1999 [metaconfig 3.0 PL70]
+# Generated on Fri Jan  8 10:36:44 EET 1999 [metaconfig 3.0 PL70]
 # (with additional metaconfig patches by jhi@iki.fi)
 
 cat >/tmp/c1$$ <<EOF
@@ -902,7 +902,6 @@ defvoidused=15
 useposix=true
 : set useopcode=false in your hint file to disable the Opcode extension.
 useopcode=true
-: set use64bits on the Configure command line to enable 64 bit support.
 : set usemultiplicity on the Configure command line to enable multiplicity.
 : set usethreads on the Configure command line to enable threads.
 : List of libraries we want.
@@ -2459,16 +2458,30 @@ $undef$define) . ./whoa; eval "$var=\$tu";;
 *) eval "$var=$val";;
 esac'
 
-: Look for a hint-file generated 'call-back-unit'.  If the
-: user has specified that a threading perl is to be built,
-: we may need to set or change some other defaults.
+cat <<EOM
+
+Perl can be built to take advantage of threads, on some systems.
+To do so, Configure must be run with -Dusethreads.
+(See README.threads for details.)
+EOM
 case "$usethreads" in
-$define|true|[yY]*)
-	if $test -f usethreads.cbu; then
-		. ./usethreads.cbu
-	fi
-	;;
+$define|true|[yY]*)	dflt='y';;
+*) dflt='n';;
 esac
+rp='Build a threading Perl?'
+. ./myread
+case "$ans" in
+y|Y)	val="$define" ;;     
+*)      val="$undef" ;;
+esac
+set usethreads
+eval $setvar 
+: Look for a hint-file generated 'call-back-unit'.  Now that the
+: user has specified if a threading perl is to be built, we may need 
+: to set or change some other defaults.
+if $test -f usethreads.cbu; then
+    . ./usethreads.cbu
+fi
 case "$d_oldpthreads" in
 '')	: Configure tests would be welcome here.  For now, assume undef.
 	val="$undef" ;;
@@ -2477,14 +2490,51 @@ esac
 set d_oldpthreads
 eval $setvar
 
+cat <<EOM
+
+Perl can be built so that multiple Perl interpreters can coexist
+within the same Perl executable.  To do so, Configure must be run with
+-Dusemultiplicity.
+
+Normally you do not need this and you should answer no.
+
+EOM
 case "$usemultiplicity" in
-$define|true|[yY]*)	usemultiplicity="$define" ;;
-*) 			usemultiplicity="$undef"  ;;
+$define|true|[yY]*)	dflt='y';;
+*) dflt='n';;
+esac
+rp='Build Perl for multiplicity?'
+. ./myread
+case "$ans" in
+y|Y)	val="$define" ;;     
+*)      val="$undef" ;;
 esac
+set usemultiplicity
+eval $setvar 
+
+cat <<EOM
+
+Perl can be built to take advantage of explicit 64-bit interfaces,
+on some systems.  To do so, Configure must be run with -Duse64bits.
+
+If this doesn't make any sense to you, just accept the default 'n'.
+EOM
 case "$use64bits" in
-$define|true|[yY]*)	use64bits="$define" ;;
-*) 			use64bits="$undef"  ;;
+$define|true|[yY]*)	dflt='y';;
+*) dflt='n';;
 esac
+rp='Try to use explicit 64-bit interfaces, if available?'
+. ./myread
+case "$ans" in
+y|Y) 
+	val="$define"
+	;;     
+*)      
+	val="$undef"
+	;;
+esac
+set use64bits
+eval $setvar
 
 archname64=''