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

diff --git a/Makefile.PL b/Makefile.PL
index fe93d21..9abd407 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -4,11 +4,7 @@ use strict;
 use warnings;
 use ExtUtils::MakeMaker;
 
-BEGIN {
- eval { require Config };
- die 'OS unsupported' if $@;
- Config->import(qw<%Config>);
-}
+use Config;
 
 my @DEFINES;
 my %macro;
@@ -20,7 +16,7 @@ my $as_perl = eval {
 
 my $is_as_822 = 0;
 print "Checking if this is ActiveState Perl 5.8.8 build 822 or higher... ";
-if ("$]" == 5.008008 and defined $as_perl and $as_perl >= 822) {
+if ("$]" == 5.008_008 and defined $as_perl and $as_perl >= 822) {
  $is_as_822 = 1;
  push @DEFINES, '-DVMG_COMPAT_ARRAY_PUSH_NOLEN=1';
 }
@@ -40,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.010001) {
- push @DEFINES, '-DVMG_FORKSAFE=0';
+if ($^O eq 'MSWin32' && "$]" < 5.010_001) {
+ push @DEFINES, '-DXSH_FORKSAFE=0';
  print "Fork safety not ensured for perl 5.8.x and 5.10.0 on Windows.\n";
 }
 
@@ -74,21 +79,31 @@ my %PREREQ_PM = (
  'base'     => 0,
 );
 
+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,
+);
+
 my %META = (
  configure_requires => {
   'Config'              => 0,
   'ExtUtils::MakeMaker' => 0,
  },
  build_requires => {
-  'Carp'                => 0,
-  'Config'              => 0,
-  'ExtUtils::MakeMaker' => 0,
-  'Test::More'          => 0,
-  %PREREQ_PM,
+  %BUILD_REQUIRES,
  },
  dynamic_config => 1,
  resources => {
-  bugtracker => "http://rt.cpan.org/NoAuth/ReportBug.html?Queue=$dist",
+  bugtracker => "http://rt.cpan.org/Dist/Display.html?Name=$dist",
   homepage   => "http://search.cpan.org/dist/$dist/",
   license    => 'http://dev.perl.org/licenses/',
   repository => "http://git.profvince.com/?p=perl%2Fmodules%2F$dist.git",
@@ -103,15 +118,16 @@ WriteMakefile(
  ABSTRACT_FROM    => $file,
  PL_FILES         => {},
  @DEFINES,
+ BUILD_REQUIRES   => \%BUILD_REQUIRES,
  PREREQ_PM        => \%PREREQ_PM,
- MIN_PERL_VERSION => 5.008,
+ MIN_PERL_VERSION => '5.008',
  META_MERGE       => \%META,
  dist             => {
   PREOP    => "pod2text -u $file > \$(DISTVNAME)/README",
   COMPRESS => 'gzip -9f', SUFFIX => 'gz'
  },
  clean            => {
-  FILES => "$dist-* *.gcov *.gcda *.gcno cover_db Debian_CPANTS.txt"
+  FILES => "$dist-* *.gcov *.gcda *.gcno cover_db Debian_CPANTS.txt*"
  },
  %macro,
 );