dougm 02/05/21 09:48:29
Modified: lib/Apache Build.pm
lib/ModPerl BuildOptions.pm
Log:
allow MP_AP_PREFIX to be a source tree directory
Revision Changes Path
1.87 +10 -9 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.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- Build.pm 21 May 2002 16:19:51 -0000 1.86
+++ Build.pm 21 May 2002 16:48:29 -0000 1.87
@@ -65,10 +65,6 @@
return "include/ directory not found in $prefix";
}
- if (-e "$prefix/CHANGES") {
- return "$prefix is a build directory (need an install directory)";
- }
-
return '';
}
@@ -556,7 +552,7 @@
return $self->{dir} if $self->{dir};
- if(IS_MOD_PERL_BUILD) {
+ if (IS_MOD_PERL_BUILD) {
my $build = $self->build_config;
if ($dir = $build->{'dir'}) {
@@ -566,6 +562,8 @@
}
}
+ $dir ||= $self->{MP_AP_PREFIX};
+
# we not longer install Apache headers, so dont bother looking in @INC
# might end up finding 1.x headers anyhow
# unless ($dir and -d $dir) {
@@ -1051,10 +1049,13 @@
push @inc, $self->mp_include_dir;
- my $ainc = $self->apxs('-q' => 'INCLUDEDIR');
- if (-d $ainc) {
- push @inc, $ainc;
- return \@inc;
+ my $prefix = $self->{MP_AP_PREFIX};
+ if (-d $prefix and not -e "$prefix/CHANGES") {
+ my $ainc = $self->apxs('-q' => 'INCLUDEDIR');
+ if (-d $ainc) {
+ push @inc, $ainc;
+ return \@inc;
+ }
}
for ("$src/modules/perl", "$src/include",
1.16 +1 -1 modperl-2.0/lib/ModPerl/BuildOptions.pm
Index: BuildOptions.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/lib/ModPerl/BuildOptions.pm,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- BuildOptions.pm 21 May 2002 16:19:51 -0000 1.15
+++ BuildOptions.pm 21 May 2002 16:48:29 -0000 1.16
@@ -164,7 +164,7 @@
OPTIONS_FILE Read options from given file
STATIC_EXTS Build Apache::*.xs as static extensions
APXS Path to apxs
-AP_PREFIX Apache installation prefix
+AP_PREFIX Apache installation or source tree prefix
XS_GLUE_DIR Directories containing extension glue
INCLUDE_DIR Add directories to search for header files
GENERATE_XS Generate XS code based on httpd version
