From: Andy Dougherty <doughera@lafayette.edu>
Date: Tue, 16 Apr 2002 13:39:14 +0000 (-0400)
Subject: Re: [-Uusedl] Encode does work but perl -V goes funny!
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=f1f6834f1aab62b16fad0d2701b8ba1ff5fabddf;p=p5sagit%2Fp5-mst-13.2.git

Re: [-Uusedl] Encode does work but perl -V goes funny!
Message-ID: <Pine.SOL.4.10.10204161333450.28145-100000@maxwell.phys.lafayette.edu>

p4raw-id: //depot/perl@15959
---

diff --git a/Configure b/Configure
index a29caa3..57e166c 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 Sun Apr 14 18:24:18 EET DST 2002 [metaconfig 3.0 PL70]
+# Generated on Wed Apr 17 02:10:04 EET DST 2002 [metaconfig 3.0 PL70]
 # (with additional metaconfig patches by perlbug@perl.org)
 
 cat >c1$$ <<EOF
@@ -19461,16 +19461,6 @@ EOM
 	: Exclude those that are not xs extensions
 	case "$dflt" in
 	'')	dflt=none;;
-        *)  case " $dflt " in
-            *" Encode "*) # Add the subextensions of Encode
-                cd "$rsrc/ext"
-                for xxx in `ls Encode/*/Makefile.PL|awk -F/ '{print $2}'`; do
-                        dflt="$dflt Encode/$xxx"
-                done
-                cd "$tdir"
-                ;;
-            esac
-            ;;
 	esac
 	rp="What extensions do you wish to include?"
 	. ./myread
@@ -19480,6 +19470,20 @@ EOM
 	esac
 	;;
 esac
+#        
+# Encode is a special case.  If we are building Encode as a static
+# extension, we need to explicitly list its subextensions as well.
+# For other nested extensions, this is handled automatically by
+# the appropriate Makefile.PL.
+case " $static_ext " in
+	*" Encode "*) # Add the subextensions of Encode
+	cd "$rsrc/ext"
+	for xxx in `ls Encode/*/Makefile.PL|awk -F/ '{print $2}'`; do
+		static_ext="$static_ext Encode/$xxx"
+	done
+	cd "$tdir"
+	;;
+esac
 
 set X $dynamic_ext $static_ext $nonxs_ext
 shift