More symbol scan logic from Alan Burlison.

[perl5.git] / win32 / config_sh.PL

diff --git a/win32/config_sh.PL b/win32/config_sh.PL
index 35bb6e2..3b76cd0 100644 (file)
--- a/win32/config_sh.PL
+++ b/win32/config_sh.PL
@@ -49,11 +49,8 @@ my @noxs    = FindExt::noxs_extensions();
 my @known   = sort(@dynamic,split(/\s+/,$opt{'staticext'}),@noxs);
 $opt{'known_extensions'} = join(' ',@known);
 
-if (!$opt{'use5005threads'} || $opt{'use5005threads'} eq 'undef')
- {
-  @dynamic = grep(!/Thread/,@dynamic);
-  @known   = grep(!/Thread/,@dynamic);
- }
+@dynamic = grep(!/Thread/,@dynamic);
+@known   = grep(!/Thread/,@dynamic);
 
 $opt{'dynamic_ext'} = join(' ',@dynamic);
 $opt{'nonxs_ext'}   = join(' ',@noxs);
@@ -76,6 +73,8 @@ 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{'cf_by'} = $ENV{USERNAME} unless $opt{'cf_by'};
 $opt{'cf_email'} = $opt{'cf_by'} . '@' . (gethostbyname('localhost'))[0]
@@ -85,6 +84,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_]+)=(.*)$/) {
@@ -100,4 +110,3 @@ while (<>) {
     }
     print;
 }
-