X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=Makefile.PL;h=1ad0ceacc6503785983db3374bee99f590749843;hb=4622b2e2dd6a1ee85bbc63dfb5c736be78d87beb;hp=cef05b243960677eb4be4031f21aff54c6cd4086;hpb=5ee81319ae7bca761e7fa6f33df2794a1cb5be76;p=perl%2Fmodules%2FVariable-Magic.git

diff --git a/Makefile.PL b/Makefile.PL
index cef05b2..1ad0cea 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -7,21 +7,11 @@ use ExtUtils::MakeMaker;
 BEGIN {
  eval { require Config };
  die 'OS unsupported' if $@;
- Config->import(qw/%Config/);
+ Config->import(qw<%Config>);
 }
 
 my @DEFINES;
-
-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 %macro;
 
 my $as_perl = eval {
  require ActivePerl;
@@ -30,37 +20,45 @@ 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';
 }
 print $is_as_822 ? "yes\n" : "no\n";
 
-my $is_5110rel = 0;
-print "Checking if this is a released perl 5.11.0 or higher... ";
-if ($^V ge v5.11.0 and not defined $pl) {
- my $describe = $Config{git_describe};
- # An empty 'describe' is fine
- if (defined $describe and $describe !~ /^GitLive-/) {
-  $is_5110rel = 1;
-  push @DEFINES, '-DVMG_COMPAT_ARRAY_PUSH_NOLEN=0';
+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>};
+ if ($gccversion =~ /^3\.4\.[0-9]+/ and $libperl =~ s/\.lib$//) {
+  $is_gcc_34 = 1;
+  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>};
+  $macro{LDDLFLAGS}    = "$lddlflags $libdirs $libperl";
+  $macro{LDFLAGS}      = "$ldflags $libdirs $libperl";
+  $macro{PERL_ARCHIVE} = '',
  }
 }
-print $is_5110rel ? "yes\n" : "no\n";
+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";
 }
 
 @DEFINES = (DEFINE => join ' ', @DEFINES) if @DEFINES;
+%macro   = (macro  => { %macro })         if %macro; # Beware of the circle
 
 my $dist = 'Variable-Magic';
 
@@ -106,13 +104,14 @@ 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            => {
   FILES => "$dist-* *.gcov *.gcda *.gcno cover_db Debian_CPANTS.txt"
  },
+ %macro,
 );