gozer 2004/09/20 23:43:53
Modified: . Changes
lib/Apache Build.pm
Log:
When searching for ap(r|u)-config in httpd's source tree, search
into srclib/apr-util as well as srclib/apr
Revision Changes Path
1.491 +3 -0 modperl-2.0/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl-2.0/Changes,v
retrieving revision 1.490
retrieving revision 1.491
diff -u -r1.490 -r1.491
--- Changes 21 Sep 2004 03:29:18 -0000 1.490
+++ Changes 21 Sep 2004 06:43:53 -0000 1.491
@@ -12,6 +12,9 @@
=item 1.99_17-dev
+When searching for ap(r|u)-config in httpd's source tree, search
+into srclib/apr-util as well as srclib/apr [Gozer]
+
Remove APR::Finfo::pool as it has no use to us [Stas]
get PerlSetVar and PerlAddVar multi-level merges to (finally) work
1.181 +4 -3 modperl-2.0/lib/Apache/Build.pm
Index: Build.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/lib/Apache/Build.pm,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- Build.pm 20 Sep 2004 21:05:34 -0000 1.180
+++ Build.pm 21 Sep 2004 06:43:53 -0000 1.181
@@ -983,9 +983,10 @@
if (!$self->{$key}) {
my @tries = ();
if ($self->httpd_is_source_tree) {
- push @tries, grep { -d $_ }
- map catdir($_, "srclib", "apr"),
- grep defined $_, $self->dir;
+ for my $base (grep defined $_, $self->dir) {
+ push @tries, grep -d $_,
+ map catdir($base, "srclib", $_), qw(apr apr-util);
+ }
}
else {
push @tries, grep length,
