Author: jorton Date: Fri Nov 16 13:51:25 2012 New Revision: 1410343 URL: http://svn.apache.org/viewvc?rev=1410343&view=rev Log: * lib/Apache2/ParseSource.pm (include_dirs): Pick up APR include dir iff different to httpd include dir.
Submitted by: Jan Kaluza <jkaluza redhat.com>, jorton Modified: perl/modperl/trunk/lib/Apache2/ParseSource.pm Modified: perl/modperl/trunk/lib/Apache2/ParseSource.pm URL: http://svn.apache.org/viewvc/perl/modperl/trunk/lib/Apache2/ParseSource.pm?rev=1410343&r1=1410342&r2=1410343&view=diff ============================================================================== --- perl/modperl/trunk/lib/Apache2/ParseSource.pm (original) +++ perl/modperl/trunk/lib/Apache2/ParseSource.pm Fri Nov 16 13:51:25 2012 @@ -115,8 +115,16 @@ sub scan { sub include_dirs { my $self = shift; - ($self->config->apxs('-q' => 'INCLUDEDIR'), - $self->config->mp_include_dir); + my $inc = $self->config->apxs('-q' => 'INCLUDEDIR'); + my @dirs = ($inc, $self->config->mp_include_dir); + my $aprinc = $self->config->apxs('-q' => 'APR_INCLUDEDIR'); + + unless ($aprinc eq $inc) { + # Add APR include directory if different to httpd includedir + push @dirs, $aprinc; + } + + @dirs; } sub includes { shift->config->includes }