dougm 01/01/03 21:57:40
Modified: . Makefile.PL
lib/Apache Build.pm
lib/ModPerl BuildOptions.pm
Log:
allow building with apxs
Revision Changes Path
1.24 +11 -6 modperl-2.0/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Makefile.PL 2001/01/02 20:35:41 1.23
+++ Makefile.PL 2001/01/04 05:57:39 1.24
@@ -33,12 +33,17 @@
system_sanity_check();
set_modperl_version();
- for my $path ($build->find) {
- $build->dir($path);
- my $mmn = $build->module_magic_number;
- my $v = $build->httpd_version;
- next unless $v;
- last if $build->prompt_y("Configure mod_perl with $path?");
+ if ($build->{MP_APXS}) {
+ print "Using $build->{MP_APXS}\n";
+ }
+ else {
+ for my $path ($build->find) {
+ $build->dir($path);
+ my $mmn = $build->module_magic_number;
+ my $v = $build->httpd_version;
+ next unless $v;
+ last if $build->prompt_y("Configure mod_perl with $path?");
+ }
}
my $httpd_version = $build->httpd_version;
1.25 +16 -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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Build.pm 2001/01/04 04:08:20 1.24
+++ Build.pm 2001/01/04 05:57:39 1.25
@@ -740,19 +740,24 @@
return $typemaps;
}
-sub inc {
+sub includes {
my $self = shift;
my $src = $self->dir;
my $os = is_win32 ? 'win32' : 'unix';
- my @inc = ();
+ my @inc = $self->file_path("src/modules/perl");
+
+ my $ainc = $self->apxs('-q' => 'INCLUDEDIR');
+ if (-d $ainc) {
+ push @inc, $ainc;
+ return \@inc;
+ }
for ("$src/modules/perl", "$src/include",
"$src/srclib/apr/include",
"$src/srclib/apr-util/include",
- "$src/os/$os",
- $self->file_path("src/modules/perl"))
+ "$src/os/$os")
{
- push @inc, "-I$_" if -d $_;
+ push @inc, $_ if -d $_;
}
my $ssl_dir = "$src/../ssl/include";
@@ -760,12 +765,14 @@
my $build = $self->build_config;
$ssl_dir = join '/', $self->{MP_SSL_BASE} || '', 'include';
}
- push @inc, "-I$ssl_dir" if -d $ssl_dir;
+ push @inc, $ssl_dir if -d $ssl_dir;
- my $ainc = $self->apxs('-q' => 'INCLUDEDIR');
- push @inc, "-I$ainc" if -d $ainc;
+ return \@inc;
+}
- return "@inc";
+sub inc {
+ my @includes = map { "-I$_" } @{ shift->includes };
+ "@includes";
}
sub ccflags {
1.3 +1 -0 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BuildOptions.pm 2000/06/20 16:04:26 1.2
+++ BuildOptions.pm 2001/01/04 05:57:39 1.3
@@ -144,3 +144,4 @@
PROMPT_DEFAULT Accept default value for all would-be prompts
OPTIONS_FILE Read options from given file
DYNAMIC Build Apache::*.xs as dynamic extensions
+APXS Path to apxs
