From: Nicholas Clark <nick@ccl4.org>
Date: Thu, 24 Sep 2009 18:50:21 +0000 (+0100)
Subject: VMS also should search for extensions in cpan/ as well as ext/
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=0189e3e0c11fda5109423cb9a66f65ea9ad2d2e5;p=p5sagit%2Fp5-mst-13.2.git

VMS also should search for extensions in cpan/ as well as ext/
---

diff --git a/configure.com b/configure.com
index 3a6456b..d79d6f4 100644
--- a/configure.com
+++ b/configure.com
@@ -2726,7 +2726,8 @@ $ xxx = ""
 $ OPEN/READ CONFIG 'manifestfound'
 $ext_loop:
 $   READ/END_OF_FILE=end_ext/ERROR=end_ext CONFIG line
-$   IF F$EXTRACT(0,4,line) .NES. "ext/" THEN goto ext_loop
+$   IF F$EXTRACT(0,4,line) .NES. "ext/" .AND. -
+       F$EXTRACT(0,5,line) .NES. "cpan/" THEN goto ext_loop
 $   line = F$EDIT(line,"COMPRESS")
 $   line = F$ELEMENT(0," ",line)
 $   IF F$EXTRACT(0,4,line) .EQS. "ext/"
@@ -2734,6 +2735,11 @@ $   THEN
 $     xxx = F$ELEMENT(1,"/",line)
 $     IF F$SEARCH("[-.ext]''xxx'.DIR;1") .EQS. "" THEN GOTO ext_loop
 $   ENDIF
+$   IF F$EXTRACT(0,5,line) .EQS. "cpan/"
+$   THEN
+$     xxx = F$ELEMENT(1,"/",line)
+$     IF F$SEARCH("[-.cpan]''xxx'.DIR;1") .EQS. "" THEN GOTO ext_loop
+$   ENDIF
 $   IF xxx .EQS. "DynaLoader" THEN goto ext_loop     ! omit
 $!
 $! (extspec = xxx) =~ tr!-!/!
@@ -2784,11 +2790,11 @@ $	xxx = F$EXTRACT(F$LENGTH(extspec) + 1, extlen, xxx)
 $   ENDIF
 $!
 $ found_new_extension:
-$   IF F$SEARCH("[-.ext.''extension_dir_name']*.xs") .NES. ""
+$   IF F$SEARCH("[-.ext.''extension_dir_name']*.xs") .EQS. "" .AND. F$SEARCH("[-.cpan.''extension_dir_name']*.xs") .EQS. ""
 $   THEN
-$       known_extensions = known_extensions + " ''extspec'"
-$   ELSE
 $       nonxs_ext = nonxs_ext + " ''extspec'"
+$   ELSE
+$       known_extensions = known_extensions + " ''extspec'"
 $   ENDIF
 $   goto ext_loop
 $end_ext: