X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2FLexical-Types.git;a=blobdiff_plain;f=Makefile.PL;h=0a318e2581b4862141e568eb14407ff9cc4a9cb0;hp=c8440d1f223d1b95d74c9a5e97c525a09d409167;hb=bc16ea8dc7913595c3d1379136877fa6f7e7af2f;hpb=c8223c2b729cdac4d9b77f634ed31613ce5620bf

diff --git a/Makefile.PL b/Makefile.PL
index c8440d1..0a318e2 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,15 +1,10 @@
-use 5.008003;
+use 5.008_004;
 
 use strict;
 use warnings;
 use ExtUtils::MakeMaker;
 
-BEGIN {
- local $@;
- eval { require Config };
- die 'OS unsupported' if $@;
- Config->import(qw/%Config/);
-}
+use Config;
 
 my @DEFINES;
 my %macro;
@@ -17,29 +12,38 @@ my %macro;
 my $is_gcc_34 = 0;
 print "Checking if this is gcc 3.4 on Windows trying to link against an import library... ";
 if ($^O eq 'MSWin32' and not grep /^LD[A-Z]*=/, @ARGV) {
- my ($libperl, $gccversion) = map $_ || '', @Config{qw/libperl gccversion/};
+ my ($libperl, $gccversion) = map $_ || '', @Config{qw<libperl gccversion>};
  if ($gccversion =~ /^3\.4\.[0-9]+/ and $libperl =~ s/\.lib$//) {
   $is_gcc_34 = 1;
-  my ($lddlflags, $ldflags) = @Config{qw/lddlflags ldflags/};
+  my ($lddlflags, $ldflags) = @Config{qw<lddlflags ldflags>};
   $_ ||= '', s/-L(?:".*?"|\S+)//g for $lddlflags, $ldflags;
   $libperl = "-l$libperl";
   my $libdirs = join ' ',
                  map { s/(?<!\\)((?:\\\\)*")/\\$1/g; qq[-L"$_"] }
-                  @Config{qw/bin sitebin/};
+                  @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' && $^V lt v5.9.0) {
+if ($^O eq 'MSWin32' && "$]" < 5.009) {
  push @DEFINES, '-DLT_MULTIPLICITY=0';
 }
 
 # Fork emulation got "fixed" in 5.10.1
-if ($^O eq 'MSWin32' && $^V lt v5.10.1) {
+if ($^O eq 'MSWin32' && "$]" < 5.010_001) {
  push @DEFINES, '-DLT_FORKSAFE=0';
 }
 
@@ -58,19 +62,26 @@ my %PREREQ_PM = (
  'XSLoader' => 0,
 );
 
+my %BUILD_REQUIRES = (
+ 'Config'              => 0,
+ 'ExtUtils::MakeMaker' => 0,
+ 'Test::More'          => 0,
+ 'constant'            => 0,
+ 'lib'                 => 0,
+ %PREREQ_PM,
+);
+
 my %META = (
  configure_requires => {
+  'Config'              => 0,
   'ExtUtils::MakeMaker' => 0,
  },
  build_requires => {
-  'ExtUtils::MakeMaker' => 0,
-  'Test::More'          => 0,
-  'constant'            => 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",
@@ -85,15 +96,16 @@ WriteMakefile(
  ABSTRACT_FROM    => $file,
  PL_FILES         => {},
  @DEFINES,
+ BUILD_REQUIRES   => \%BUILD_REQUIRES,
  PREREQ_PM        => \%PREREQ_PM,
- MIN_PERL_VERSION => 5.008003,
+ MIN_PERL_VERSION => '5.008004',
  META_MERGE       => \%META,
  dist             => {
-  PREOP    => "pod2text $file > \$(DISTVNAME)/README",
+  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,
 );