X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=Makefile.PL;h=1ad0ceacc6503785983db3374bee99f590749843;hb=39d298473b7bb1073edb5d64515c7c7e7be7c7fb;hp=05b4eb3fb0a34e47faed575a274e08d2c1efb706;hpb=d29a774d106d145036eda849ab57f42410100008;p=perl%2Fmodules%2FVariable-Magic.git diff --git a/Makefile.PL b/Makefile.PL index 05b4eb3..1ad0cea 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -7,23 +7,12 @@ use ExtUtils::MakeMaker; BEGIN { eval { require Config }; die 'OS unsupported' if $@; - Config->import(qw/%Config/); + Config->import(qw<%Config>); } my @DEFINES; my %macro; -my $pl = $Config{perl_patchlevel}; -print "Checking perl patchlevel... "; -if (defined $pl && length $pl) { - $pl = int $pl; - push @DEFINES, '-DVMG_PERL_PATCHLEVEL=' . $pl; - print $pl, "\n"; -} else { - $pl = undef; - print "none\n"; -} - my $as_perl = eval { require ActivePerl; defined &ActivePerl::BUILD ? ActivePerl::BUILD() : undef @@ -31,7 +20,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 ($^V eq v5.8.8 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,15 +29,15 @@ print $is_as_822 ? "yes\n" : "no\n"; 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}; 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}; $_ ||= '', s/-L(?:".*?"|\S+)//g for $lddlflags, $ldflags; $libperl = "-l$libperl"; my $libdirs = join ' ', map { s/(?}; $macro{LDDLFLAGS} = "$lddlflags $libdirs $libperl"; $macro{LDFLAGS} = "$ldflags $libdirs $libperl"; $macro{PERL_ARCHIVE} = '', @@ -57,13 +46,13 @@ 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, '-DVMG_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' && $^V lt v5.10.1) { +if ($^O eq 'MSWin32' && "$]" < 5.010_001) { push @DEFINES, '-DVMG_FORKSAFE=0'; print "Fork safety not ensured for perl 5.8.x and 5.10.0 on Windows.\n"; } @@ -115,10 +104,10 @@ WriteMakefile( PL_FILES => {}, @DEFINES, PREREQ_PM => \%PREREQ_PM, - MIN_PERL_VERSION => 5.008, + MIN_PERL_VERSION => '5.008', META_MERGE => \%META, dist => { - PREOP => "pod2text $file > \$(DISTVNAME)/README", + PREOP => "pod2text -u $file > \$(DISTVNAME)/README", COMPRESS => 'gzip -9f', SUFFIX => 'gz' }, clean => {