X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=Makefile.PL;h=b3a340e27a9021d3408cf532bb803f3eda21ba0d;hb=efaabfbfb6d1fc8db7ae1722ff0aa18e8c1b7e6c;hp=90cf373092b47adc033393fcae8ead4424285bbc;hpb=efdd31ea6fbfd1f16a56a47f8039a8934ba9d6e8;p=perl%2Fmodules%2FVariable-Magic.git

diff --git a/Makefile.PL b/Makefile.PL
index 90cf373..b3a340e 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -23,14 +23,18 @@ if (defined $pl && length $pl) {
 }
 
 my $is_as = 0;
-print "Checking if this is Windows ActiveState 5.8.[78]... ";
-if ($^O eq 'MSWin32' && $^V ge v5.8.7 && $^V lt v5.8.9) {
+print "Checking if this is ActiveState Perl 5.8.8 build 822 or higher... ";
+if ($^V eq v5.8.8) {
  eval {
-  require Win32;
+  require ActivePerl;
   1;
  } and do {
-  if (defined &Win32::BuildNumber) {
-   $is_as = 1;
+  if (defined &ActivePerl::BUILD) {
+   my $build = int ActivePerl::BUILD();
+   if ($build >= 822) {
+    $is_as = 1;
+    push @DEFINES, '-DVMG_COMPAT_ARRAY_PUSH_NOLEN=1';
+   }
   }
  }
 }
@@ -41,6 +45,11 @@ if ($^O eq 'MSWin32' && $^V lt v5.9.0) {
  push @DEFINES, '-DVMG_MULTIPLICITY=0';
 }
 
+# Fork emulation got "fixed" in 5.10.1
+if ($^O eq 'MSWin32' && $^V lt v5.10.1) {
+ push @DEFINES, '-DVMG_FORKSAFE=0';
+}
+
 @DEFINES = (DEFINE => join ' ', @DEFINES) if @DEFINES;
 
 my $dist = 'Variable-Magic';
@@ -75,7 +84,8 @@ WriteMakefile(
     PREREQ_PM        => {
         'Carp'     => 0,
         'Exporter' => 0,
-        'XSLoader' => 0
+        'XSLoader' => 0,
+        'base'     => 0,
     },
     MIN_PERL_VERSION => 5.008,
     META_MERGE       => \%META,