Author: stas
Date: Mon May 9 13:37:33 2005
New Revision: 169354
URL: http://svn.apache.org/viewcvs?rev=169354&view=rev
Log:
When compiling a static mod_perl and
MP_AP_CONFIGURE="--with-apr=/some/path" argument is given, Apache will
use the apr-config at the given path, but mod_perl was using the
default at "srclib/apr/.libs". Fix that
Contributed by: Nick *** <[EMAIL PROTECTED]>
Modified:
perl/modperl/trunk/Changes
perl/modperl/trunk/lib/Apache2/Build.pm
Modified: perl/modperl/trunk/Changes
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?rev=169354&r1=169353&r2=169354&view=diff
==============================================================================
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Mon May 9 13:37:33 2005
@@ -12,6 +12,11 @@
=item 1.999_24-dev
+When compiling a static mod_perl and
+MP_AP_CONFIGURE="--with-apr=/some/path" argument is given, Apache will
+use the apr-config at the given path, but mod_perl was using the
+default at "srclib/apr/.libs". Fix that [Nick *** <[EMAIL PROTECTED]>]
+
Show MP_APU_CONFIG as an argument to Makefile.PL in the Usage
menu. [Nick *** <[EMAIL PROTECTED]>]
Modified: perl/modperl/trunk/lib/Apache2/Build.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/Build.pm?rev=169354&r1=169353&r2=169354&view=diff
==============================================================================
--- perl/modperl/trunk/lib/Apache2/Build.pm (original)
+++ perl/modperl/trunk/lib/Apache2/Build.pm Mon May 9 13:37:33 2005
@@ -1110,6 +1110,15 @@
push @tries, grep -d $_,
map catdir($base, "srclib", $_), qw(apr apr-util);
}
+
+ # Check for MP_AP_CONFIGURE="--with-apr[-util]=DIR|FILE"
+ my $what_long = ($what eq 'apu') ? 'apr-util' : 'apr';
+ if ($self->{MP_AP_CONFIGURE} &&
+ $self->{MP_AP_CONFIGURE} =~ /--with-${what_long}=(\S+)/) {
+ my $dir = $1;
+ $dir =~ s/$config$// unless -d $dir;
+ push @tries, grep -d $_, $dir, catdir $dir, 'bin';
+ }
}
else {
push @tries, grep length,
