[EMAIL PROTECTED] wrote:
stas 2003/10/21 15:09:11
Modified: perl-framework/Apache-Test/lib/Apache TestConfig.pm
Log:
complete the removal of hardcoding project/lib (besides the autogenerated
t/TEST and other scripts where mp2 build must have it in @INC)
[snip]
+ # mp2 needs its modper-2.0/lib before blib was created
+ if (IS_MOD_PERL_2_BUILD || $ENV{APACHE_TEST_LIVE_DEV}) {
+ # the live 'lib/' dir of the distro
+ # (e.g. modperl-2.0/ModPerl-Registry/lib)
+ my $dir = canonpath catdir $FindBin::Bin, "lib";
+ push @dirs, $dir if -d $dir;
+
+ # the live dir of the top dir if any (e.g. modperl-2.0/lib)
+ if (-e catfile($FindBin::Bin, "..", "Makefile.PL")) {
+ my $dir = canonpath catdir $FindBin::Bin, "..", "lib";
+ push @dirs, $dir if -d $dir;
+ }
I should have noticed this before, but all the mod_perl foo in TestConfig really belongs in TestConfigPerl (including the stuff that was there before this flurry of commits :)
it's too late for 1.05 at this point (which I hope to release on monday or tuesday) but right afterward I'm going to clean up a bit and remove all traces of mod_perl from TestConfig.
--Geoff
