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

diff --git a/win32/config_sh.PL b/win32/config_sh.PL
index 9757e52..1d9a831 100644
--- a/win32/config_sh.PL
+++ b/win32/config_sh.PL
@@ -34,8 +34,6 @@ sub loadopts {
     }
 }
 
-FindExt::scan_ext("../ext");
-
 my %opt;
 
 my $optref = loadopts();
@@ -44,8 +42,17 @@ while (@{$optref} && $optref->[0] =~ /^([\w_]+)=(.*)$/) {
     shift(@{$optref});
 }
 
-$opt{'dynamic_ext'} = join(' ',FindExt::dynamic_extensions());
-$opt{'nonxs_ext'}   = join(' ',FindExt::noxs_extensions());
+FindExt::scan_ext("../ext");
+FindExt::scan_ext("ext");
+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{'known_extensions'} = join(' ',FindExt::known_extensions()) || ' ';
 
 my $pl_h = '../patchlevel.h';
 
@@ -63,6 +70,25 @@ else {
 }
 $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];
+
+if (exists $opt{cc}) {
+    # cl and bcc32 version detection borrowed from Test::Smoke's configsmoke.pl
+    if ($opt{cc} eq 'cl') {
+        my $output = `cl --version 2>&1`;
+        $opt{ccversion} = $output =~ /^.*Version\s+([\d.]+)/ ? $1 : '?';
+    }
+    elsif ($opt{cc} eq 'bcc32') {
+        my $output = `bcc32 --version 2>&1`;
+        $opt{ccversion} = $output =~ /([\d.]+)/ ? $1 : '?';
+    }
+    elsif ($opt{cc} eq 'gcc') {
+        chomp($opt{gccversion} = `gcc -dumpversion`);
+    }
+}
 
 $opt{'cf_by'} = $ENV{USERNAME} unless $opt{'cf_by'};
 $opt{'cf_email'} = $opt{'cf_by'} . '@' . (gethostbyname('localhost'))[0]
@@ -72,6 +98,17 @@ $opt{'usemymalloc'} = 'y' if $opt{'d_mymalloc'} eq 'define';
 $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()) {
+    $opt{d_flock} = 'undef';
+    $opt{d_link} = 'undef';
+}
+
+if ($opt{uselargefiles} ne 'define') {
+    $opt{lseeksize} = 4;
+    $opt{lseektype} = 'off_t';
+}
+
 while (<>) {
     s/~([\w_]+)~/$opt{$1}/g;
     if (/^([\w_]+)=(.*)$/) {
@@ -87,4 +124,3 @@ while (<>) {
     }
     print;
 }
-