X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=win32%2Fconfig_sh.PL;h=1d9a83183961039f75590bb1ad6d44a7e0e5e0d0;hb=802134916c56985ba8dc700565240474646eb9f7;hp=646b5c2026a8e9bde8620ac4c71eeb7ccde77960;hpb=f203173faf09af5447759fb1352e0e866dcc01fc;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/win32/config_sh.PL b/win32/config_sh.PL
index 646b5c2..1d9a831 100644
--- a/win32/config_sh.PL
+++ b/win32/config_sh.PL
@@ -43,13 +43,15 @@ while (@{$optref} && $optref->[0] =~ /^([\w_]+)=(.*)$/) {
 }
 
 FindExt::scan_ext("../ext");
+FindExt::scan_ext("ext");
 FindExt::set_static_extensions(split ' ', $opt{'static_ext'});
 
-my @dynamic = grep(!/Thread/,FindExt::dynamic_ext());
+my @dynamic_ext = grep(!/Thread/,FindExt::dynamic_ext());
+my @extensions  = grep(!/Thread/,FindExt::extensions());
 $opt{'nonxs_ext'}        = join(' ',FindExt::nonxs_ext()) || ' ';
 $opt{'static_ext'}       = join(' ',FindExt::static_ext()) || ' ';
-$opt{'dynamic_ext'}      = join(' ',@dynamic) || ' ';
-$opt{'extensions'}       = join(' ',FindExt::extensions()) || ' ';
+$opt{'dynamic_ext'}      = join(' ',@dynamic_ext) || ' ';
+$opt{'extensions'}       = join(' ',@extensions) || ' ';
 $opt{'known_extensions'} = join(' ',FindExt::known_extensions()) || ' ';
 
 my $pl_h = '../patchlevel.h';
@@ -81,8 +83,7 @@ if (exists $opt{cc}) {
     }
     elsif ($opt{cc} eq 'bcc32') {
         my $output = `bcc32 --version 2>&1`;
-        $opt{ccversion} = $output =~ /(\d+.*)/ ? $1 : '?';
-        $opt{ccversion} =~ s/\s+copyright.*//i;
+        $opt{ccversion} = $output =~ /([\d.]+)/ ? $1 : '?';
     }
     elsif ($opt{cc} eq 'gcc') {
         chomp($opt{gccversion} = `gcc -dumpversion`);