diff options
| -rw-r--r-- | Makefile.SH | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/Makefile.SH b/Makefile.SH index f1b353deff..3c6e8e3436 100644 --- a/Makefile.SH +++ b/Makefile.SH @@ -129,6 +129,15 @@ case "$osname" in ;; esac +case "$usedl" in +define) testreqext="$testreqext \$(DYNALOADER)" ;; +esac + +case "$DPERL_EXTERNAL_GLOB" in +"") ;; +*) testreqext="$testreqext \$(EXTGLOB)" ;; +esac + echo "Extracting Makefile (with variable substitutions)" $spitshell >Makefile <<!GROK!THIS! # Makefile.SH @@ -186,6 +195,9 @@ static_ext = $static_list nonxs_ext = $nonxs_list ext = \$(dynamic_ext) \$(static_ext) \$(nonxs_ext) DYNALOADER = lib/auto/DynaLoader/DynaLoader\$(LIB_EXT) +EXTGLOB = lib/auto/File/Glob/Glob\$(DLSUFFIX) + +TESTREQEXT = $testreqext libs = $perllibs $cryptlib @@ -892,16 +904,16 @@ _test: fi @echo "Ran tests" > t/rantests -test check: test_prep +test check: test_prep $(TESTREQEXT) PERL=./perl $(MAKE) _test -test_tty: test_prep +test_tty: test_prep $(TESTREQEXT) PERL=./perl $(MAKE) _test_tty -test_notty: test_prep +test_notty: test_prep $(TESTREQEXT) PERL=./perl $(MAKE) _test_notty -utest ucheck: test_prep +utest ucheck: test_prep $(TESTREQEXT) PERL=./perl UTF8=-utf8 $(MAKE) _test test-prep: test_prep @@ -915,13 +927,13 @@ test-notty: test_notty test_prep.third: test_prep perl.third PERL=./perl.third $(MAKE) _test_prep -test.third check.third: test_prep.third perl.third +test.third check.third: test_prep.third perl.third $(TESTREQEXT) PERL=./perl.third PERL_DEBUG=PERL_3LOG=1 $(MAKE) _test -utest.third ucheck.third: test_prep.third perl.third +utest.third ucheck.third: test_prep.third perl.third $(TESTREQEXT) PERL=./perl.third PERL_DEBUG=PERL_3LOG=1UTF=-utf8 $(MAKE) _test -test_notty.third: test_prep.third perl.third +test_notty.third: test_prep.third perl.third $(TESTREQEXT) PERL=./perl.third $(MAKE) PERL_DEBUG=PERL_3LOG=1 _test_notty # Can't depend on lib/Config.pm because that might be where miniperl |