You are viewing a plain text version of this content. The canonical link for it is here.
Posted to apreq-cvs@httpd.apache.org by ra...@apache.org on 2005/10/19 07:05:28 UTC
svn commit: r326393 - /httpd/apreq/trunk/Makefile.PL
Author: randyk
Date: Tue Oct 18 22:05:23 2005
New Revision: 326393
URL: http://svn.apache.org/viewcvs?rev=326393&view=rev
Log:
- get rid of warning on Win32 about an unitialized --with-apache2-apxs option
if this is not passed in
- try using Apache2::Build->build_config->{MP_AP_PREFIX} on Win32 to get
top-level Apache2 directory, if all else fails - this should also enable
building just with 'perl Makefile.PL' if MP_AP_PREFIX was specified
when building mod_perl
Modified:
httpd/apreq/trunk/Makefile.PL
Modified: httpd/apreq/trunk/Makefile.PL
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/Makefile.PL?rev=326393&r1=326392&r2=326393&view=diff
==============================================================================
--- httpd/apreq/trunk/Makefile.PL (original)
+++ httpd/apreq/trunk/Makefile.PL Tue Oct 18 22:05:23 2005
@@ -59,12 +59,20 @@
my @candidates = qw(with-apache2-apxs with-apache2-httpd
with-apr-config with-apu-config);
foreach my $opt(@candidates) {
- next unless $args{$opt};
- (my $d = File::Basename::dirname($args{$opt})) =~ s{(\\|/)bin}{};
- if (-d $d) {
- delete $args{$opt};
- $args{'with-apache2'} = $d;
+ my $c = delete $args{$opt};
+ next unless $c;
+ (my $dir = File::Basename::dirname($c)) =~ s{(\\|/)bin}{};
+ if (-d $dir) {
+ $args{'with-apache2'} = $dir;
last;
+ }
+ }
+ unless ($args{'with-apache2'}) {
+ my $mp_ap_prefix = eval {
+ Apache2::Build->build_config->{MP_AP_PREFIX};
+ };
+ if ($mp_ap_prefix and -d $mp_ap_prefix) {
+ $args{'with-apache2'} = $mp_ap_prefix;
}
}
}