Simplify Config loading in Makefile.PL

[perl/modules/Lexical-Types.git] / Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index 1e126e8d6be53f49abda979c671faec0d829a8a1..e7593bc1bf699df83e4c084ee0f4e5e38b9cba2c 100644 (file)
--- 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;
@@ -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            => {