stas 2004/08/26 18:34:29
Modified: . Makefile.PL Changes
Log:
Fix interactive prompting at perl Makefile.PL, when no APXS or
MP_AP_PREFIX were provided. now asking for an alternative location if
the suggested choices weren't selected.
Revision Changes Path
1.157 +16 -2 modperl-2.0/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -u -r1.156 -r1.157
--- Makefile.PL 19 Aug 2004 07:42:46 -0000 1.156
+++ Makefile.PL 27 Aug 2004 01:34:29 -0000 1.157
@@ -207,13 +207,27 @@
debug "Using Apache prefix => $build->{MP_AP_PREFIX}";
}
else {
+ my $ok = 0;
for my $path ($build->find) {
$build->dir($path);
my $mmn = $build->module_magic_number;
my $v = $build->httpd_version;
next unless $v;
next if $v lt $min_httpd_version;
- last if $build->prompt_y("Configure mod_perl with $path?");
+ $ok++ if $build->prompt_y("Configure mod_perl with $path?");
+ last if $ok;
+ }
+ until ($ok) {
+ my $ask = "Please provide the location of the Apache directory:";
+ my $ans = $build->prompt($ask);
+ # strip leading/closing spaces
+ $ans =~ s/^\s*|\s*$//g;
+ if (defined $ans and -d $ans) {
+ $build->dir($ans);
+ $ok++;
+ }
+ else {
+ error "Can't find dir '$ans'"; }
}
}
@@ -229,7 +243,7 @@
}
exit(1);
}
-
+
my $min_version;
if ($build->should_build_apache) {
$min_version = $min_httpd_version_static;
1.471 +4 -0 modperl-2.0/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl-2.0/Changes,v
retrieving revision 1.470
retrieving revision 1.471
diff -u -u -r1.470 -r1.471
--- Changes 25 Aug 2004 22:31:58 -0000 1.470
+++ Changes 27 Aug 2004 01:34:29 -0000 1.471
@@ -12,6 +12,10 @@
=item 1.99_17-dev
+Fix interactive prompting at perl Makefile.PL, when no APXS or
+MP_AP_PREFIX were provided. now asking for an alternative location if
+the suggested choices weren't selected. [Stas]
+
Added APR::URI->rpath method. Returns the path of an uri minus
path_info, if any. [Gozer]
