Merge perl 5.24 fixes from davem

[perl/modules/Scope-Upper.git] / Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index 52a9d4043f2cb71d7aa89b325e7b0a8cd4c6cec2..08560fb40eff28094ff62883451f9f240ea169bf 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -51,7 +51,7 @@ 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' && "$]" < 5.009) {
- push @DEFINES, '-DSU_MULTIPLICITY=0';
+ push @DEFINES, '-DXSH_MULTIPLICITY=0';
 }
 
 @DEFINES = (DEFINE => join ' ', @DEFINES) if @DEFINES;
@@ -73,6 +73,7 @@ my %PREREQ_PM = (
 my %BUILD_REQUIRES = (
  'ExtUtils::MakeMaker' => 0,
  'Config'              => 0,
+ 'POSIX'               => 0,
  'Test::More'          => 0,
  %PREREQ_PM,
 );
@@ -121,6 +122,6 @@ package MY;
 sub postamble {
  return <<'POSTAMBLE';
 testdeb: all
-       PERL_DL_NONLAZY=1 PERLDB_OPTS="NonStop=1" $(FULLPERLRUN) -MTAP::Harness -e 'TAP::Harness->new({verbosity => q{$(VERBOSE)}, lib => [ q{$(INST_LIB)}, q{$(INST_ARCHLIB)} ], switches => [ q{-d} ]})->runtests(@ARGV)' $(TEST_FILES)
+       PERL_DL_NONLAZY=1 PERLDB_OPTS="NonStop=1" $(FULLPERLRUN) -MTAP::Harness -e 'TAP::Harness->new({verbosity => q{$(TEST_VERBOSE)}, lib => [ q{$(INST_LIB)}, q{$(INST_ARCHLIB)} ], switches => [ q{-d} ]})->runtests(@ARGV)' $(TEST_FILES)
 POSTAMBLE
 }