summaryrefslogtreecommitdiff
path: root/configure.com
diff options
context:
space:
mode:
authorNicholas Clark <nick@ccl4.org>2009-09-24 19:50:21 +0100
committerNicholas Clark <nick@ccl4.org>2009-09-24 19:50:21 +0100
commit0189e3e0c11fda5109423cb9a66f65ea9ad2d2e5 (patch)
tree4479308546c61e73a05c10a5324d1f15bb3ea053 /configure.com
parentebbb719ba6d72169043d2d8e55e6c70c19f8a47c (diff)
downloadperl-0189e3e0c11fda5109423cb9a66f65ea9ad2d2e5.tar.gz
VMS also should search for extensions in cpan/ as well as ext/
Diffstat (limited to 'configure.com')
-rw-r--r--configure.com14
1 files changed, 10 insertions, 4 deletions
diff --git a/configure.com b/configure.com
index 3a6456b23e..d79d6f4377 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: