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

diff --git a/Makefile.PL b/Makefile.PL
index c8440d1..e7593bc 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -4,12 +4,7 @@ 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,15 +12,15 @@ 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} = '',
@@ -34,12 +29,12 @@ if ($^O eq 'MSWin32' and not grep /^LD[A-Z]*=/, @ARGV) {
 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.010001) {
  push @DEFINES, '-DLT_FORKSAFE=0';
 }
 
@@ -60,9 +55,11 @@ my %PREREQ_PM = (
 
 my %META = (
  configure_requires => {
+  'Config'              => 0,
   'ExtUtils::MakeMaker' => 0,
  },
  build_requires => {
+  'Config'              => 0,
   'ExtUtils::MakeMaker' => 0,
   'Test::More'          => 0,
   'constant'            => 0,
@@ -89,7 +86,7 @@ WriteMakefile(
  MIN_PERL_VERSION => 5.008003,
  META_MERGE       => \%META,
  dist             => {
-  PREOP    => "pod2text $file > \$(DISTVNAME)/README",
+  PREOP    => "pod2text -u $file > \$(DISTVNAME)/README",
   COMPRESS => 'gzip -9f', SUFFIX => 'gz'
  },
  clean            => {