X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=Makefile.PL;h=9abd4077d3707ea01b13a9499b385927d664b5ec;hb=c8d895863a1166ba76b133c7c9ae61359191a0fa;hp=97be25760df2544e59e0f49f8e0175a6c1a1f09b;hpb=057c4a6806e4d489d099d9244aaf4e71cf05493a;p=perl%2Fmodules%2FVariable-Magic.git

diff --git a/Makefile.PL b/Makefile.PL
index 97be257..9abd407 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -36,20 +36,29 @@ if ($^O eq 'MSWin32' and not grep /^LD[A-Z]*=/, @ARGV) {
                   @Config{qw<bin sitebin>};
   $macro{LDDLFLAGS}    = "$lddlflags $libdirs $libperl";
   $macro{LDFLAGS}      = "$ldflags $libdirs $libperl";
-  $macro{PERL_ARCHIVE} = '',
+  eval <<'  MY_SECTION';
+   package MY;
+   sub dynamic_lib {
+    my $self = shift;
+    my $inherited = $self->SUPER::dynamic_lib(@_);
+    $inherited =~ s/"?\$\(PERL_ARCHIVE\)"?//g;
+    return $inherited;
+   }
+  MY_SECTION
+  die $@ if $@;
  }
 }
 print $is_gcc_34 ? "yes\n" : "no\n";
 
 # Threads, Windows and 5.8.x don't seem to be best friends
 if ($^O eq 'MSWin32' && "$]" < 5.009) {
- push @DEFINES, '-DVMG_MULTIPLICITY=0';
+ push @DEFINES, '-DXSH_MULTIPLICITY=0';
  print "Thread safety disabled for perl 5.8.x on Windows.\n"
 }
 
 # Fork emulation got "fixed" in 5.10.1
 if ($^O eq 'MSWin32' && "$]" < 5.010_001) {
- push @DEFINES, '-DVMG_FORKSAFE=0';
+ push @DEFINES, '-DXSH_FORKSAFE=0';
  print "Fork safety not ensured for perl 5.8.x and 5.10.0 on Windows.\n";
 }
 
@@ -74,7 +83,13 @@ my %BUILD_REQUIRES = (
  'Carp'                => 0,
  'Config'              => 0,
  'ExtUtils::MakeMaker' => 0,
+ 'IO::Handle'          => 0,
+ 'IO::Select'          => 0,
+ 'IPC::Open3'          => 0,
+ 'POSIX'               => 0,
+ 'Socket'              => 0,
  'Test::More'          => 0,
+ 'lib'                 => 0,
  %PREREQ_PM,
 );