On Tue, Aug 24, 2004 at 11:52:15PM -0700, Stas Bekman wrote:
> but Joe, don't let this discussion get on your way, commit the thing
> (after the 2.0 way) and we will optimise it later.
But re-ordering the tests really defeats the point of the change (which
was to *skip* all the messy 2.0 tests and get straight to the point
using -q APR_CONFIG). Let's forget about this change, it's just a
cleanup anyway, the current code works OK.
The thing I really want is to fix out-of-tree apr-util builds anyway,
can someone commit that half of the patch if it's OK?
Index: Build.pm
===================================================================
RCS file: /home/cvspublic/modperl-2.0/lib/Apache/Build.pm,v
retrieving revision 1.171
diff -u -r1.171 Build.pm
--- Build.pm 22 Aug 2004 17:57:40 -0000 1.171
+++ Build.pm 25 Aug 2004 10:04:01 -0000
@@ -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;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
