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 1998/12/11 23:44:04 UTC
cvs commit: modperl Changes Makefile.PL ToDo
dougm 98/12/11 14:44:04
Modified: . Changes Makefile.PL ToDo
Log:
default --with-layout to `Apache' for 1.3.4, can be overridden with
APACI_ARGS or APACHE_LAYOUT Makefile.PL attribute
Revision Changes Path
1.224 +3 -0 modperl/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl/Changes,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -r1.223 -r1.224
--- Changes 1998/12/11 22:33:34 1.223
+++ Changes 1998/12/11 22:44:02 1.224
@@ -8,6 +8,9 @@
=item 1.16_03-dev
+default --with-layout to `Apache' for 1.3.4, can be overridden with
+APACI_ARGS or APACHE_LAYOUT Makefile.PL attribute
+
t/TEST =~ s/mod_perl_httpd.pid/httpd.pid
[Bruce W. Hoylman <bh...@advtech.uswest.com>]
1.117 +10 -1 modperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/modperl/Makefile.PL,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- Makefile.PL 1998/11/30 23:14:57 1.116
+++ Makefile.PL 1998/12/11 22:44:02 1.117
@@ -163,6 +163,7 @@
$ALL_HOOKS = 0;
$APACHE_SRC = "";
$APACHE_PREFIX = "";
+$APACHE_LAYOUT = "Apache";
$APACHE_HEADER_INSTALL = 1;
$PERL_SECTIONS = 0;
$PERL_SSI = 0;
@@ -200,7 +201,8 @@
my %PassEnv = map { $_,1 } qw(SSL_BASE);
my @mp_args = (keys %PassEnv,
- qw(EXPERIMENTAL EVERYTHING DO_HTTPD NO_HTTPD CONFIG ADD_MODULE APACHE_PREFIX
+ qw(EXPERIMENTAL EVERYTHING DO_HTTPD NO_HTTPD CONFIG ADD_MODULE
+ APACHE_PREFIX APACHE_LAYOUT
USE_APACI USE_DSO USE_APXS WITH_APXS APACI_ARGS PREP_HTTPD
ALL_HOOKS ADD_VERSION STATIC DYNAMIC PORT XS_IMPORT));
@@ -880,8 +882,15 @@
if($PERL_EXTRA_CFLAGS) {
$cmd .= qq(CFLAGS="$PERL_EXTRA_CFLAGS" );
}
+
$cmd .= "./configure " .
"--activate-module=src/modules/perl/libperl.a";
+
+ my $v = httpd_version($APACHE_SRC, 1);
+ if($v >= 134 and $APACI_ARGS !~ /--with-layout=/) {
+ $cmd .= " --with-layout=$APACHE_LAYOUT";
+ }
+
if($USE_DSO) {
$cmd .= " --enable-shared=perl";
}
1.128 +0 -2 modperl/ToDo
Index: ToDo
===================================================================
RCS file: /home/cvs/modperl/ToDo,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- ToDo 1998/12/11 22:33:35 1.127
+++ ToDo 1998/12/11 22:44:03 1.128
@@ -13,8 +13,6 @@
- <perl> sections and DirectoryIndex (Eric Cholet)
-- APACHE_LAYOUT (or similar) to provide a default for --layout
-
- Apache::ExtUtils error checking
- Perl{Set,Pass}Env tainted, should they not be? (Vivek)