You are viewing a plain text version of this content. The canonical link for it is here.
Posted to modperl-cvs@perl.apache.org by do...@hyperreal.org on 1999/12/21 20:16:41 UTC
cvs commit: modperl/lib/Apache src.pm
dougm 99/12/21 11:16:41
Modified: . Changes Makefile.PL ToDo
lib/Apache src.pm
Log:
document that Apache 1.2.x is no longer supported
Apache::src now supported with USE_APXS=1
Revision Changes Path
1.364 +4 -0 modperl/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl/Changes,v
retrieving revision 1.363
retrieving revision 1.364
diff -u -r1.363 -r1.364
--- Changes 1999/12/21 15:56:07 1.363
+++ Changes 1999/12/21 19:16:31 1.364
@@ -10,6 +10,10 @@
=item 1.21_01-dev
+document that Apache 1.2.x is no longer supported
+
+Apache::src now supported with USE_APXS=1
+
'make test' AllowOverride None for Directory /
[Steve Lembark <St...@wfg.com>]
1.136 +28 -11 modperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/modperl/Makefile.PL,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- Makefile.PL 1999/12/09 06:28:49 1.135
+++ Makefile.PL 1999/12/21 19:16:32 1.136
@@ -339,8 +339,14 @@
$WITH_APXS = $USE_APXS;
}
elsif($USE_APXS and $APACHE_PREFIX) {
- $WITH_APXS = "$APACHE_PREFIX/sbin/apxs";
+ for (qw(sbin bin)) {
+ last if -e ($WITH_APXS = "$APACHE_PREFIX/$_/apxs");
+ }
+ }
+ unless ($WITH_APXS) {
+ chomp($WITH_APXS = `which apxs`);
}
+
print "Will configure via APXS";
print " (apxs=$WITH_APXS)" if $WITH_APXS;
print "\n";
@@ -642,10 +648,9 @@
my $mmn = $USE_APXS ? MMN_130 : magic_number($APACHE_SRC);
my $httpdv = $USE_APXS ? 130 : httpd_version($APACHE_SRC,1);
- unless($httpdv >= 120) {
- $callback_hooks{PERL_HEADER_PARSER} = 0;
- $cant_hook{PERL_HEADER_PARSER} =
- "(need 1.2.0 or higher)";
+ unless($httpdv >= 130) {
+ phat_warn("Apache Version 1.3.0 required, aborting...");
+ exit(1);
}
if($httpdv >= 130) {
@@ -1368,17 +1373,28 @@
sub MY::post_initialize {
my($self) = shift;
- return unless $APACHE_SRC and $APACHE_HEADER_INSTALL;
+ return unless $APACHE_HEADER_INSTALL;
+ my($ap_src, $ap_inc);
+ if ($APACHE_SRC) {
+ $ap_src = $APACHE_SRC;
+ $ap_inc = "$ap_src/include";
+ }
+ elsif ($USE_APXS) {
+ #$base = `$WITH_APXS -q INCLUDEDIR`;
+ $ap_inc = $ap_src = 'src'; #just install mod_perl headers
+ }
- $My::self = $self;
+ return unless -d $ap_src;
- finddepth(\&wanted, $APACHE_SRC);
+ $My::self = $self;
+ {
+ local $APACHE_SRC = $ap_src;
+ finddepth(\&wanted, $ap_src);
+ }
$self->{PM}{"Apache/typemap"} = '$(INST_ARCHLIB)/' . "auto/Apache/typemap";
- my $v = httpd_version($APACHE_SRC, 1);
- return '' unless $v >= 133;
for (qw(ap_config_auto.h)) {
- my $from = "$APACHE_SRC/include/$_";
+ my $from = "$ap_inc/$_";
my $to = '$(INST_ARCHLIB)/' . "auto/Apache/include/$_";
unless ($self->{PM}->{$from}) {
$self->{PM}->{$from} = $to;
@@ -1819,6 +1835,7 @@
%Setup = (
'Apache_Src' => \'$APACHE_SRC\',
'SSL_BASE' => \'$SSL_BASE\',
+ 'APXS' => \'$WITH_APXS\',
);
1;
1.210 +1 -9 modperl/ToDo
Index: ToDo
===================================================================
RCS file: /home/cvs/modperl/ToDo,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- ToDo 1999/12/21 15:56:07 1.209
+++ ToDo 1999/12/21 19:16:34 1.210
@@ -3,13 +3,10 @@
(well, close to it anyhow)
---------------------------------------------------------------------------
-- $r->current_callback should use perl_request_config instead of
- $Apache::__CurrentCallback
+- $r->current_callback broken for PerlHandler
- enable PerlRestartHandler w/ EVERYTHING=1
-- auto-call Apache::SIG->set again?
-
- solaris Perl Configure adds a space before -R in ccdlflags, see
about removing that
[Ken McNamara <co...@oaktree.net>]
@@ -18,16 +15,11 @@
e.g. libmodperl.so
[Eugene B. Byrganov <E.B.Byrganov@inp.nsk.su]
-- if $USE_APXS then install mod_perl headers files in `apxs -q INCLUDEDIR`
-
- should $r->content unset $r->headers_in('content-length') ?
- perl_reload_inc problem [Nathan Sidwell <na...@acm.org>]
- update url to Randy Kobes' win32 binary
-
-- 'make test' AllowOverride None for /
- ["Lembark, Steve" <St...@wfg.com>]
- fix t/httpd symlink logic ["Young, Geoffrey S." <yo...@acwilm.com>]
1.15 +5 -0 modperl/lib/Apache/src.pm
Index: src.pm
===================================================================
RCS file: /home/cvs/modperl/lib/Apache/src.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- src.pm 1999/09/22 16:16:34 1.14
+++ src.pm 1999/12/21 19:16:39 1.15
@@ -222,6 +222,11 @@
$ssl_dir = "$Apache::MyConfig::Setup{SSL_BASE}/include";
}
push @inc, "-I$ssl_dir" if -d $ssl_dir;
+ require Apache::MyConfig;
+ if (my $apxs = $Apache::MyConfig::Setup{'APXS'}) {
+ my $ainc = `$apxs -q INCLUDEDIR`;
+ push @inc, "-I$ainc" if -d $ainc;
+ }
return "@inc";
}