stas 2004/08/25 10:20:11
Modified: lib/Apache Build.pm
. Changes
Log:
fix the modperl build, where httpd has been built against separate
installations of apr-util and apr, where apr-util has been installed
with a different includedir to apr.
Submitted by: Joe Orton
Revision Changes Path
1.172 +7 -0 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.171
retrieving revision 1.172
diff -u -u -r1.171 -r1.172
--- Build.pm 22 Aug 2004 17:57:40 -0000 1.171
+++ Build.pm 25 Aug 2004 17:20:00 -0000 1.172
@@ -1724,6 +1724,13 @@
unless ($self->httpd_is_source_tree) {
push @inc, $self->apr_includedir;
+ my $apuc = $self->apu_config_path;
+ if ($apuc && -x $apuc) {
+ chomp(my $apuincs = qx($apuc --includes));
+ $apuincs =~ s|-I||;
+ push @inc, $apuincs;
+ }
+
my $ainc = $self->apxs('-q' => 'INCLUDEDIR');
if (-d $ainc) {
push @inc, $ainc;
1.467 +4 -0 modperl-2.0/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl-2.0/Changes,v
retrieving revision 1.466
retrieving revision 1.467
diff -u -u -r1.466 -r1.467
--- Changes 23 Aug 2004 21:16:27 -0000 1.466
+++ Changes 25 Aug 2004 17:20:04 -0000 1.467
@@ -12,6 +12,10 @@
=item 1.99_17-dev
+fix the modperl build, where httpd has been built against separate
+installations of apr-util and apr, where apr-util has been installed
+with a different includedir to apr. [Joe Orton]
+
Fix $s->log->*, $s->log_error and $s->log_serror to again log into the
vhost's error_log file (if there is one). [Stas]
