Check for threads before multiplicity in configure.com.

3b28d668e9efe9433c3099521167a6723cbddc26 depended on command-line
specification of usethreads, which of course may not be there.

1 files changed, 108 insertions, 103 deletions

diff --git a/configure.com b/configure.com
index 3fb634ddf8..7eae45923c 100644
--- a/configure.com
+++ b/configure.com
@@ -2013,109 +2013,6 @@ $ rp = "Build a DEBUGGING version of Perl? [''bool_dflt'] "
 $ GOSUB myread
 $ use_debugging_perl = ans
 $!
-$! Ask if they want to build with MULTIPLICITY
-$ echo ""
-$ echo "Perl can be built so that multiple Perl interpreters can coexist"
-$ echo "within the same Perl executable."
-$ IF usethreads .OR. usethreads .EQS. "define"
-$ THEN
-$   echo "This multiple interpreter support is required for interpreter-based threads."
-$   usemultiplicity="define"
-$ ELSE
-$   bool_dflt = "n"
-$   if f$type(usemultiplicity) .nes. "" 
-$   then
-$     if usemultiplicity .or. usemultiplicity .eqs. "define" then bool_dflt = "y"
-$   endif
-$   rp = "Build Perl for multiplicity? [''bool_dflt'] "
-$   GOSUB myread
-$   IF ans
-$   THEN
-$     usemultiplicity="define"
-$   ELSE
-$     usemultiplicity="undef"
-$   ENDIF
-$ ENDIF
-$!
-$! Ask if they want to build with 64-bit support
-$ IF (F$ELEMENT(0, "-", archname).NES."VMS_VAX").and.("''f$extract(1,3, f$getsyi(""version""))'".ges."7.1")
-$ THEN
-$   bool_dflt = "n"
-$   IF F$TYPE(use64bitint) .NES. "" 
-$   THEN
-$       IF use64bitint .OR. use64bitint .eqs. "define" THEN bool_dflt = "y"
-$   ENDIF
-$   echo ""
-$   echo "You have natively 64-bit long integers."
-$   echo ""
-$   echo "Perl can be built to take advantage of 64-bit integer types"
-$   echo "on some systems, To do so, Configure can be run with -Duse64bitint."
-$   echo "Choosing this option will most probably introduce binary incompatibilities."
-$   echo ""
-$   echo "If this does not make any sense to you, just accept the default '" + bool_dflt + "'."
-$   rp = "Try to use 64-bit integers, if available? [''bool_dflt'] "
-$   GOSUB myread
-$   use64bitint = ans
-$!
-$   bool_dflt = "n"
-$   IF F$TYPE(use64bitall) .NES. "" 
-$   THEN
-$       IF use64bitall .OR. use64bitall .eqs. "define" THEN bool_dflt = "y"
-$   ENDIF
-$   echo ""
-$   echo "You may also choose to try maximal 64-bitness.  It means using as much"
-$   echo "64-bitness as possible on the platform.  This in turn means even more"
-$   echo "binary incompatibilities.  On the other hand, your platform may not"
-$   echo "have any more 64-bitness available than what you already have chosen."
-$   echo ""
-$   echo "If this does not make any sense to you, just accept the default '" + bool_dflt + "'."
-$   rp = "Try to use maximal 64-bit support, if available? [''bool_dflt'] "
-$   GOSUB myread
-$   use64bitall=ans
-$   IF use64bitall .AND. .NOT. use64bitint
-$   THEN
-$     echo ""
-$     echo "Since you have chosen a maximally 64-bit build, I'm also turning on"
-$     echo "the use of 64-bit integers."
-$     use64bitint="Y"
-$   ENDIF
-$!
-$   bool_dflt = use64bitall
-$   IF F$TYPE(uselargefiles) .NES. "" 
-$   THEN
-$       IF uselargefiles .OR. uselargefiles .eqs. "define" THEN bool_dflt = "y"
-$   ENDIF
-$   echo ""
-$   echo "Perl can be built to understand large files (files larger than 2 gigabytes)"
-$   echo "on some systems.  To do so, Configure can be run with -Duselargefiles."
-$   echo ""
-$   echo "If this does not make any sense to you, just accept the default '" + bool_dflt + "'."
-$   rp = "Try to understand large files, if available? [''bool_dflt'] "
-$   GOSUB myread
-$   uselargefiles=ans
-$!
-$   bool_dflt = "n"
-$   IF F$TYPE(uselongdouble) .NES. "" 
-$   THEN
-$       IF uselongdouble .OR. uselongdouble .eqs. "define" THEN bool_dflt = "y"
-$   ENDIF
-$   echo ""
-$   echo "Perl can be built to take advantage of long doubles which"
-$   echo "(if available) may give more accuracy and range for floating point numbers."
-$   echo ""
-$   echo "If this does not make any sense to you, just accept the default '" + bool_dflt + "'."
-$   rp = "Try to use long doubles, if available? [''bool_dflt'] "
-$   GOSUB myread
-$   uselongdouble = ans
-$!
-$ ENDIF ! not VAX && >= 7.1
-$!
-$ IF usesitecustomize .OR. usesitecustomize .eqs. "define" 
-$ THEN 
-$       usesitecustomize = "define"
-$ ELSE
-$       usesitecustomize = "undef"
-$ ENDIF
 $!
 $! Ask about threads, if appropriate
 $ IF ccname .EQS. "DEC" .OR. ccname .EQS. "CXX"
@@ -2149,6 +2046,7 @@ $   rp = "Build a threading Perl? [''bool_dflt'] "
 $   GOSUB myread
 $   if ans
 $   THEN
+$     usethreads = "define"
 $     use_threads="T"
 $     ! Shall we do the 5.005-type threads, or IThreads?
 $     echo "Since release 5.6, Perl has had two different threading implementations,"
@@ -2218,10 +2116,117 @@ $           	ENDIF
 $           ENDIF
 $       ENDIF
 $     ENDIF
+$   ELSE
+$     usethreads = "undef"
 $   ENDIF
 $ ENDIF
 $ IF F$TYPE(usethreadupcalls) .EQS. "" THEN usethreadupcalls = "undef"
 $ IF F$TYPE(usekernelthreads) .EQS. "" THEN usekernelthreads = "undef"
+$!
+$! Ask if they want to build with MULTIPLICITY
+$ echo ""
+$ echo "Perl can be built so that multiple Perl interpreters can coexist"
+$ echo "within the same Perl executable."
+$ IF usethreads .OR. usethreads .EQS. "define"
+$ THEN
+$   echo "This multiple interpreter support is required for interpreter-based threads."
+$   usemultiplicity="define"
+$ ELSE
+$   bool_dflt = "n"
+$   if f$type(usemultiplicity) .nes. "" 
+$   then
+$     if usemultiplicity .or. usemultiplicity .eqs. "define" then bool_dflt = "y"
+$   endif
+$   rp = "Build Perl for multiplicity? [''bool_dflt'] "
+$   GOSUB myread
+$   IF ans
+$   THEN
+$     usemultiplicity="define"
+$   ELSE
+$     usemultiplicity="undef"
+$   ENDIF
+$ ENDIF
+$!
+$! Ask if they want to build with 64-bit support
+$ IF (F$ELEMENT(0, "-", archname).NES."VMS_VAX").and.("''f$extract(1,3, f$getsyi(""version""))'".ges."7.1")
+$ THEN
+$   bool_dflt = "n"
+$   IF F$TYPE(use64bitint) .NES. "" 
+$   THEN
+$       IF use64bitint .OR. use64bitint .eqs. "define" THEN bool_dflt = "y"
+$   ENDIF
+$   echo ""
+$   echo "You have natively 64-bit long integers."
+$   echo ""
+$   echo "Perl can be built to take advantage of 64-bit integer types"
+$   echo "on some systems, To do so, Configure can be run with -Duse64bitint."
+$   echo "Choosing this option will most probably introduce binary incompatibilities."
+$   echo ""
+$   echo "If this does not make any sense to you, just accept the default '" + bool_dflt + "'."
+$   rp = "Try to use 64-bit integers, if available? [''bool_dflt'] "
+$   GOSUB myread
+$   use64bitint = ans
+$!
+$   bool_dflt = "n"
+$   IF F$TYPE(use64bitall) .NES. "" 
+$   THEN
+$       IF use64bitall .OR. use64bitall .eqs. "define" THEN bool_dflt = "y"
+$   ENDIF
+$   echo ""
+$   echo "You may also choose to try maximal 64-bitness.  It means using as much"
+$   echo "64-bitness as possible on the platform.  This in turn means even more"
+$   echo "binary incompatibilities.  On the other hand, your platform may not"
+$   echo "have any more 64-bitness available than what you already have chosen."
+$   echo ""
+$   echo "If this does not make any sense to you, just accept the default '" + bool_dflt + "'."
+$   rp = "Try to use maximal 64-bit support, if available? [''bool_dflt'] "
+$   GOSUB myread
+$   use64bitall=ans
+$   IF use64bitall .AND. .NOT. use64bitint
+$   THEN
+$     echo ""
+$     echo "Since you have chosen a maximally 64-bit build, I'm also turning on"
+$     echo "the use of 64-bit integers."
+$     use64bitint="Y"
+$   ENDIF
+$!
+$   bool_dflt = use64bitall
+$   IF F$TYPE(uselargefiles) .NES. "" 
+$   THEN
+$       IF uselargefiles .OR. uselargefiles .eqs. "define" THEN bool_dflt = "y"
+$   ENDIF
+$   echo ""
+$   echo "Perl can be built to understand large files (files larger than 2 gigabytes)"
+$   echo "on some systems.  To do so, Configure can be run with -Duselargefiles."
+$   echo ""
+$   echo "If this does not make any sense to you, just accept the default '" + bool_dflt + "'."
+$   rp = "Try to understand large files, if available? [''bool_dflt'] "
+$   GOSUB myread
+$   uselargefiles=ans
+$!
+$   bool_dflt = "n"
+$   IF F$TYPE(uselongdouble) .NES. "" 
+$   THEN
+$       IF uselongdouble .OR. uselongdouble .eqs. "define" THEN bool_dflt = "y"
+$   ENDIF
+$   echo ""
+$   echo "Perl can be built to take advantage of long doubles which"
+$   echo "(if available) may give more accuracy and range for floating point numbers."
+$   echo ""
+$   echo "If this does not make any sense to you, just accept the default '" + bool_dflt + "'."
+$   rp = "Try to use long doubles, if available? [''bool_dflt'] "
+$   GOSUB myread
+$   uselongdouble = ans
+$!
+$ ENDIF ! not VAX && >= 7.1
+$!
+$ IF usesitecustomize .OR. usesitecustomize .eqs. "define" 
+$ THEN 
+$       usesitecustomize = "define"
+$ ELSE
+$       usesitecustomize = "undef"
+$ ENDIF
+$!
 $! Case sensitive?
 $   echo ""
 $   echo "By default, perl (and pretty much everything else on VMS) uses"