From ff42dc34466c8b7bbb2a617e236c88a26a35aa12 Mon Sep 17 00:00:00 2001
From: Gurusamy Sarathy <gsar@cpan.org>
Date: Mon, 10 Jan 2000 04:38:45 +0000
Subject: [PATCH] useithreads needs usemultiplicity

p4raw-id: //depot/perl@4778
---
 Configure | 37 ++++++++++++++++++++++---------------
 perl.h    |  4 ++++
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/Configure b/Configure
index c9e4e0d..e2751bc 100755
--- a/Configure
+++ b/Configure
@@ -2678,7 +2678,7 @@ case "$usethreads" in
 $define)
 	$cat <<EOM
 
-As of 5.5.64, Perl has two different internal threading implementations,
+As of 5.5.640, Perl has two different internal threading implementations,
 the 5.005 version (5005threads) and an interpreter-based version
 (ithreads) that has one interpreter per thread.  Both are very 
 experimental.  This arrangement exists to help developers work out
@@ -2741,24 +2741,31 @@ EOM
 	;;
 esac
 
-cat <<EOM
+case "$useithreads" in
+$define|true|[yY]*)
+	echo "Interpreter threads requested, multiple interpreter support enabled..." >&4
+	val="$define" ;;
+*)
+	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.
+	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.
+	Normally you do not need this and you should answer no.
 
 EOM
-case "$usemultiplicity" in
-$define|true|[yY]*)	dflt='y';;
-*) dflt='n';;
-esac
-rp='Build Perl for multiplicity?'
-. ./myread
-case "$ans" in
-y|Y)	val="$define" ;;     
-*)      val="$undef" ;;
+	case "$usemultiplicity" in
+	$define|true|[yY]*)	dflt='y';;
+	*) dflt='n';;
+	esac
+	rp='Build Perl for multiplicity?'
+	. ./myread
+	case "$ans" in
+	y|Y)	val="$define" ;;     
+	*)      val="$undef" ;;
+	esac
+	;;
 esac
 set usemultiplicity
 eval $setvar 
diff --git a/perl.h b/perl.h
index ab150a5..ecc1ce1 100644
--- a/perl.h
+++ b/perl.h
@@ -43,6 +43,10 @@
 #  endif
 #endif
 
+#if defined(USE_ITHREADS) && !defined(MULTIPLICITY)
+#  include "error: USE_ITHREADS must be built with MULTIPLICITY"
+#endif
+
 #if defined(MULTIPLICITY)
 #  ifndef PERL_IMPLICIT_CONTEXT
 #    define PERL_IMPLICIT_CONTEXT
-- 
2.7.4