Better wording, suggested by Eric Cholet.

[p5sagit/p5-mst-13.2.git] / win32 / config_sh.PL

diff --git a/win32/config_sh.PL b/win32/config_sh.PL
index 6aa2a32..67f9c20 100644 (file)
--- a/win32/config_sh.PL
+++ b/win32/config_sh.PL
@@ -43,15 +43,13 @@ while (@{$optref} && $optref->[0] =~ /^([\w_]+)=(.*)$/) {
 }
 
 FindExt::scan_ext("../ext");
-FindExt::scan_ext("ext");
+FindExt::scan_ext("ext") if -d 'ext';  # also look in win32/ext/ if it exists
 FindExt::set_static_extensions(split ' ', $opt{'static_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_ext) || ' ';
-$opt{'extensions'}       = join(' ',@extensions) || ' ';
+$opt{'dynamic_ext'}      = join(' ',FindExt::dynamic_ext()) || ' ';
+$opt{'extensions'}       = join(' ',FindExt::extensions()) || ' ';
 $opt{'known_extensions'} = join(' ',FindExt::known_extensions()) || ' ';
 
 my $pl_h = '../patchlevel.h';
@@ -68,12 +66,27 @@ if (-e $pl_h) {
 else {
     die "Can't find $pl_h: $!";
 }
+
+my $patch_file = '../.patch';
+
+if (-e $patch_file) {
+    open my $fh, "<", $patch_file or die "Can't open $patch_file: $!";
+    chomp($opt{PERL_PATCHLEVEL} = <$fh>);
+    close $fh;
+}
+
 $opt{VERSION} = "$opt{PERL_REVISION}.$opt{PERL_VERSION}.$opt{PERL_SUBVERSION}";
 $opt{INST_VER} =~ s|~VERSION~|$opt{VERSION}|g;
 $opt{'version_patchlevel_string'} = "version $opt{PERL_VERSION} subversion $opt{PERL_SUBVERSION}";
 $opt{'version_patchlevel_string'} .= " patchlevel $opt{PERL_PATCHLEVEL}" if exists $opt{PERL_PATCHLEVEL};
 
-$opt{'osvers'} = join '.', (Win32::GetOSVersion())[1,2];
+my $ver = `ver 2>nul`;
+if ($ver =~ /Version (\d+\.\d+)/) {
+    $opt{'osvers'} = $1;
+}
+else {
+    $opt{'osvers'} = '4.0';
+}
 
 if (exists $opt{cc}) {
     # cl and bcc32 version detection borrowed from Test::Smoke's configsmoke.pl
@@ -99,7 +112,7 @@ $opt{libpth} = mungepath($opt{libpth}) if exists $opt{libpth};
 $opt{incpath} = mungepath($opt{incpath}) if exists $opt{incpath};
 
 # some functions are not available on Win9x
-if (defined(&Win32::IsWin95) && Win32::IsWin95()) {
+unless (defined $ENV{SYSTEMROOT}) { # SystemRoot has been introduced by WinNT
     $opt{d_flock} = 'undef';
     $opt{d_link} = 'undef';
 }