From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Tue, 16 Apr 2002 22:10:11 +0000 (+0000)
Subject: metaconfig unit change for #15959.
X-Git-Tag: 5.26.1~567
X-Git-Url: https://perl5.git.perl.org/metaconfig.git/commitdiff_plain/7542330710d902703a973812c862cf277f2d248a

metaconfig unit change for #15959.

p4raw-id: //depot/metaconfig@15960
---

diff --git a/U/perl/Extensions.U b/U/perl/Extensions.U
index 447f57c..e5bccc6 100644
--- a/U/perl/Extensions.U
+++ b/U/perl/Extensions.U
@@ -327,16 +327,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
@@ -347,6 +337,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