From 50dd2a3c2f762392b0ea202783880b0c2f111e26 Mon Sep 17 00:00:00 2001
From: "H.Merijn Brand" <h.m.brand@xs4all.nl>
Date: Wed, 9 May 2007 16:33:02 +0000
Subject: [PATCH] backport #31114 [PATCH-revised] Remove ext/Thread

p4raw-id: //depot/metaconfig@31180
---
 U/perl/Extensions.U    |  6 +++---
 U/threads/usethreads.U | 33 ++++++++++++---------------------
 2 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/U/perl/Extensions.U b/U/perl/Extensions.U
index e89f6e8..0feaf33 100644
--- a/U/perl/Extensions.U
+++ b/U/perl/Extensions.U
@@ -10,7 +10,7 @@
 ?MAKE:known_extensions extensions dynamic_ext static_ext nonxs_ext \
 	useposix useopcode : \
 	Myread hint usedl d_sem d_socket i_db i_dbm i_rpcsvcdbm i_gdbm \
-	i_ndbm usethreads useithreads package test cat rsrc \
+	i_ndbm usethreads use5005threads package test cat rsrc \
 	d_msg d_shm osname use64bitint i_langinfo d_nl_langinfo \
 	libs
 ?MAKE:	-pick add $@ %<
@@ -188,8 +188,8 @@ for xxx in $known_extensions ; do
 	Thread|thread)
                 case "$usethreads" in
                 true|$define|y)
-                        case "$useithreads" in
-                        $undef|false|[nN]*) avail_ext="$avail_ext $xxx" ;;
+                        case "$use5005threads" in
+                        $define|true|[yY]*) avail_ext="$avail_ext $xxx" ;;
                         esac
 		esac
 		;;
diff --git a/U/threads/usethreads.U b/U/threads/usethreads.U
index f523de0..ca8c4e4 100644
--- a/U/threads/usethreads.U
+++ b/U/threads/usethreads.U
@@ -178,29 +178,20 @@ EOM
 else
 : perl-5.9.x and later
 
-    use5005threads="$undef"
-    case "$usethreads" in
-    $define)
-	: Default to ithreads unless overridden on command line or with
-	: old config.sh
-	dflt='y'
-	case "$useithreads" in
-		$undef|false|[nN]*) dflt='n';;
-	esac
-	rp='Use the newer interpreter-based ithreads?'
-	. ./myread
-	case "$ans" in
-	y|Y)    val="$define" ;;
-	*)      val="$undef" ;;
+    if test X"$usethreads" = "X$define"; then
+	case "$use5005threads" in
+	    $define|true|[yY]*)
+		$cat >&4 <<EOM
+
+5.005 threads has been removed for 5.10.  Perl will be built using ithreads.
+
+EOM
+	    ;;
 	esac
-	set useithreads
-	eval $setvar
-	;;
-    *)
-	useithreads="$undef"
-	;;
-    esac
+    fi
 
+    use5005threads="$undef"
+    useithreads="$usethreads"
 fi
 
 if test X"$usethreads" = "X$define" -a "X$useperlio" = "Xundef"; then
-- 
1.8.3.1