Author: stas Date: Wed Dec 1 14:00:15 2004 New Revision: 109383
URL: http://svn.apache.org/viewcvs?view=rev&rev=109383 Log: If none of MP_APXS, MP_AP_PREFIX and MP_USE_STATIC were specified when configuring Makefile.PL, we now prompt for APXS path first and only if that fails ask for MP_AP_PREFIX. This is a requirement to get 'make test' find httpd.
Modified: perl/modperl/trunk/Changes perl/modperl/trunk/Makefile.PL
[...]
Modified: perl/modperl/trunk/Makefile.PL
Url: http://svn.apache.org/viewcvs/perl/modperl/trunk/Makefile.PL?view=diff&rev=109383&p1=perl/modperl/trunk/Makefile.PL&r1=109382&p2=perl/modperl/trunk/Makefile.PL&r2=109383
==============================================================================
--- perl/modperl/trunk/Makefile.PL (original)
+++ perl/modperl/trunk/Makefile.PL Wed Dec 1 14:00:15 2004
@@ -26,6 +26,7 @@
use Config;
use File::Spec::Functions;
+use File::Spec;
use DirHandle ();
use File::Copy 'cp';
use File::Basename 'basename';
@@ -227,6 +228,13 @@
debug "Using Apache prefix => $build->{MP_AP_PREFIX}";
}
else {
+ unless ($build->{MP_USE_STATIC}) {
This one check has been standardized as $build->should_build_apache();
+ # may populate $build->{MP_APXS}
+ prompt_for_apxs($build);
+ }
+ }
+
+ unless ($build->{MP_APXS} or $build->{MP_AP_PREFIX}) {
> [...] -- -------------------------------------------------------------------------------- Philippe M. Chiasson m/gozer\@(apache|cpan|ectoplasm)\.org/ GPG KeyID : 88C3A5A5 http://gozer.ectoplasm.org/ F9BF E0C2 480E 7680 1AE5 3631 CB32 A107 88C3A5A5
signature.asc
Description: OpenPGP digital signature
