Re: [PATCH} perlio and threading @ 10576 + report

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

diff --git a/win32/config_h.PL b/win32/config_h.PL
index 0a4e6ce..a0ee22d 100644 (file)
--- a/win32/config_h.PL
+++ b/win32/config_h.PL
@@ -5,6 +5,21 @@ use File::Copy qw(copy);
 my $OBJ   = 1 if $Config{'ccflags'} =~ /PERL_OBJECT/i;
 my $name = $0;
 $name =~ s#^(.*)\.PL$#../$1.SH#;
+my %opt;
+while (@ARGV && $ARGV[0] =~ /^([\w_]+)=(.*)$/)
+ {
+  $opt{$1}=$2;
+  shift(@ARGV);
+ }
+
+$opt{CONFIG_H} ||= 'config.h';
+
+my $patchlevel = $opt{INST_VER};
+$patchlevel =~ s|^[\\/]||;
+$patchlevel =~ s|~VERSION~|$Config{version}|g;
+$patchlevel ||= $Config{version};
+$patchlevel = qq["$patchlevel"];
+
 open(SH,"<$name") || die "Cannot open $name:$!";
 while (<SH>)
  {
@@ -12,6 +27,8 @@ while (<SH>)
  }
 ($term,$file,$pat) = /^sed\s+<<(\S+)\s+>(\S+)\s+(.*)$/;
 
+$file =~ s/^\$(\w+)$/$opt{$1}/g;
+
 my $str = "sub munge\n{\n";
 
 while ($pat =~ s/-e\s+'([^']*)'\s*//)
@@ -28,7 +45,7 @@ eval $str;
 die "$str:$@" if $@;
 
 open(H,">$file.new") || die "Cannot open $file.new:$!";
-binmode H;             # no CRs (which cause a spurious rebuild)
+#binmode H;            # no CRs (which cause a spurious rebuild)
 while (<SH>)
  {
   last if /^$term$/o;
@@ -37,26 +54,17 @@ while (<SH>)
   munge();
   s/\\\$/\$/g;
   s#/[ *\*]*\*/#/**/#;
-  # if (/^\s*#define\s+ARCHLIB_EXP/)
-  #  {
-  #    $_ = "#define ARCHLIB_EXP (win32_perllib_path(ARCHNAME,NULL))\t/**/\n";
-  #  }
-  if (/^\s*#define\s+PRIVLIB_EXP/)
+  if (/^\s*#define\s+(PRIVLIB|SITELIB|VENDORLIB)_EXP/)
    {
-     $_ = "#define PRIVLIB_EXP (win32_get_stdlib(patchlevel))\t/**/\n"
+     $_ = "#define ". $1 . "_EXP (win32_get_". lc($1) . "($patchlevel))\t/**/\n";
    }
-  # if (/^\s*#define\s+SITEARCH_EXP/)
-  #  {
-  #    $_ = "#define SITEARCH_EXP (win32_perllib_path(\"site\",ARCHNAME,NULL))\t/**/\n";
-  #  }
-  if (/^\s*#define\s+SITELIB_EXP/)
+  # incpush() handles archlibs, so disable them
+  elsif (/^\s*#define\s+(ARCHLIB|SITEARCH|VENDORARCH)_EXP/)
    {
-     $_ = "#define SITELIB_EXP (win32_get_sitelib(patchlevel))\t/**/\n";
+     $_ = "/*#define ". $1 . "_EXP \"\"\t/**/\n";
    }
   print H;
  }
-print H "#include <win32.h>
-";
 close(H);
 close(SH);