Remove ext/Thread

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

diff --git a/win32/config_sh.PL b/win32/config_sh.PL
index 0e1d351..21829fd 100644 (file)
--- a/win32/config_sh.PL
+++ b/win32/config_sh.PL
@@ -1,3 +1,4 @@
+use FindExt;
 # take a semicolon separated path list and turn it into a quoted
 # list of paths that Text::Parsewords will grok
 sub mungepath {
@@ -34,12 +35,23 @@ sub loadopts {
 }
 
 my %opt;
+
 my $optref = loadopts();
 while (@{$optref} && $optref->[0] =~ /^([\w_]+)=(.*)$/) {
     $opt{$1}=$2;
     shift(@{$optref});
 }
 
+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'});
+
+$opt{'nonxs_ext'}        = join(' ',FindExt::nonxs_ext()) || ' ';
+$opt{'static_ext'}       = join(' ',FindExt::static_ext()) || ' ';
+$opt{'dynamic_ext'}      = join(' ',FindExt::dynamic_ext()) || ' ';
+$opt{'extensions'}       = join(' ',FindExt::extensions()) || ' ';
+$opt{'known_extensions'} = join(' ',FindExt::known_extensions()) || ' ';
+
 my $pl_h = '../patchlevel.h';
 
 if (-e $pl_h) {
@@ -56,6 +68,31 @@ 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};
+
+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
+    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]
@@ -65,6 +102,21 @@ $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
+unless (defined $ENV{SYSTEMROOT}) { # SystemRoot has been introduced by WinNT
+    $opt{d_flock} = 'undef';
+    $opt{d_link} = 'undef';
+}
+
+if ($opt{uselargefiles} ne 'define') {
+    $opt{lseeksize} = 4;
+    $opt{lseektype} = 'off_t';
+}
+
+if ($opt{useithreads} eq 'define' && $opt{ccflags} =~ /-DPERL_IMPLICIT_SYS\b/) {
+    $opt{d_pseudofork} = 'define';
+}
+
 while (<>) {
     s/~([\w_]+)~/$opt{$1}/g;
     if (/^([\w_]+)=(.*)$/) {
@@ -80,4 +132,3 @@ while (<>) {
     }
     print;
 }
-