From a0e4e5e9e053c668fa0279d117d92ddc6d5723cc Mon Sep 17 00:00:00 2001
From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Wed, 16 May 2007 08:33:14 +0300
Subject: [PATCH] Configure (and Makefile.SH): remove ODBM_File early if c++
 (this time even with the Configure bits) Message-Id:
 <200705160233.l4G2XEET143034@kosh.hut.fi>

p4raw-id: //depot/metaconfig@31231
---
 U/perl/Extensions.U | 64 ++++++++++++++++++++++++++++-------------------------
 1 file changed, 34 insertions(+), 30 deletions(-)

diff --git a/U/perl/Extensions.U b/U/perl/Extensions.U
index 0feaf33..f3f1824 100644
--- a/U/perl/Extensions.U
+++ b/U/perl/Extensions.U
@@ -12,7 +12,7 @@
 	Myread hint usedl d_sem d_socket i_db i_dbm i_rpcsvcdbm i_gdbm \
 	i_ndbm usethreads use5005threads package test cat rsrc \
 	d_msg d_shm osname use64bitint i_langinfo d_nl_langinfo \
-	libs
+	libs d_cplusplus
 ?MAKE:	-pick add $@ %<
 ?Y:BOTTOM
 ?S:known_extensions:
@@ -131,6 +131,12 @@ for xxx in $known_extensions ; do
 		$define$define) avail_ext="$avail_ext $xxx" ;;
 		esac
 		;;
+	IPC/SysV|ipc/sysv)
+		: XXX Do we need a useipcsysv variable here
+		case "${d_msg}${d_sem}${d_shm}" in
+		*"${define}"*) avail_ext="$avail_ext $xxx" ;;
+		esac
+		;;
 	NDBM_File|ndbm_fil)
 		case "$i_ndbm" in
 		$define)
@@ -148,24 +154,28 @@ for xxx in $known_extensions ; do
 	ODBM_File|odbm_fil)
 		case "${i_dbm}${i_rpcsvcdbm}" in
 		*"${define}"*)
-		    case "$osname-$use64bitint" in
-		    hpux-define)
-			case "$libs" in
-			*-ldbm*) avail_ext="$avail_ext $xxx" ;;
+		    case "$d_cplusplus" in
+		    define) ;; # delete as a function name will not work
+		    *)  case "$osname-$use64bitint" in
+			hpux-define)
+			    case "$libs" in
+			    *-ldbm*) avail_ext="$avail_ext $xxx" ;;
+			    esac
+			    ;;
+			*) avail_ext="$avail_ext $xxx" ;;
 			esac
 			;;
-		    *) avail_ext="$avail_ext $xxx" ;;
 		    esac
 		    ;;
 		esac
 		;;
-	POSIX|posix)
-		case "$useposix" in
+	Opcode|opcode)
+		case "$useopcode" in
 		true|define|y) avail_ext="$avail_ext $xxx" ;;
 		esac
 		;;
-	Opcode|opcode)
-		case "$useopcode" in
+	POSIX|posix)
+		case "$useposix" in
 		true|define|y) avail_ext="$avail_ext $xxx" ;;
 		esac
 		;;
@@ -193,6 +203,20 @@ for xxx in $known_extensions ; do
                         esac
 		esac
 		;;
+	threads|threads/shared)
+		# threads and threads::shared are special cases.
+		# To stop people from asking "Perl 5.8.0 was supposed
+		# to have this new fancy threads implementation but my
+		# perl doesn't have it" and from people trying to
+		# (re)install the threads module using CPAN.pm and
+		# CPAN.pm then offering to reinstall Perl 5.8.0,
+		# the threads.pm and threads/shared.pm will always be
+		# there, croaking informatively ("you need to rebuild
+		# all of Perl with threads, sorry") when threads haven't
+		# been compiled in.
+		# --jhi
+		avail_ext="$avail_ext $xxx"
+		;;
 	Win32*)
 		case "$osname" in
 		cygwin) avail_ext="$avail_ext $xxx" ;;
@@ -211,26 +235,6 @@ for xxx in $known_extensions ; do
 		$define) avail_ext="$avail_ext $xxx" ;;
 		esac
 		;;
-	threads|threads/shared)
-		# threads and threads::shared are special cases.
-		# To stop people from asking "Perl 5.8.0 was supposed
-		# to have this new fancy threads implementation but my
-		# perl doesn't have it" and from people trying to
-		# (re)install the threads module using CPAN.pm and
-		# CPAN.pm then offering to reinstall Perl 5.8.0,
-		# the threads.pm and threads/shared.pm will always be
-		# there, croaking informatively ("you need to rebuild
-		# all of Perl with threads, sorry") when threads haven't
-		# been compiled in.
-		# --jhi
-		avail_ext="$avail_ext $xxx"
-		;;
-	IPC/SysV|ipc/sysv)
-		: XXX Do we need a useipcsysv variable here
-		case "${d_msg}${d_sem}${d_shm}" in
-		*"${define}"*) avail_ext="$avail_ext $xxx" ;;
-		esac
-		;;
 	*)	avail_ext="$avail_ext $xxx"
 		;;
 	esac
-- 
1.8.3.1