This supports building against a separate apr-util (i.e. where the
apr-util installed $includedir != apr $includedir), and also uses the
output of `apxs -q APR_CONFIG` where available to pick up ap[ru]-config.
I haven't tested that this doesn't break the build against 2.0.x but it
Should Be OK Really (TM).
Index: Build.pm
===================================================================
RCS file: /home/cvspublic/modperl-2.0/lib/Apache/Build.pm,v
retrieving revision 1.170
diff -u -r1.170 Build.pm
--- Build.pm 15 Aug 2004 00:18:42 -0000 1.170
+++ Build.pm 18 Aug 2004 12:48:12 -0000
@@ -976,6 +976,16 @@
$self->{$key} = $self->{$mp_key};
}
+ # 2.1 has apxs -q AP[RU]_CONFIG as the definitive location
+ my $apxs_key = uc($what) . "_CONFIG";
+ if (!$self->{$key} && !$self->httpd_is_source_tree) {
+ my $try = $self->apxs('-q' => $apxs_key);
+
+ if (-x $try) {
+ $self->{$key} = $try;
+ }
+ }
+
my $config = $self->apr_generation ? "$what-1-config" : "$what-config";
if (!$self->{$key}) {
@@ -1717,6 +1727,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) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
