dougm 01/07/06 13:08:39
Modified: . MANIFEST Makefile.PL ToDo Changes
apaci mod_perl.config.sh .cvsignore
Added: apaci perl_config.PL
Log:
make sure Apache::ExtUtils can be found when building inside of the
apache source tree
Revision Changes Path
1.68 +1 -0 modperl/MANIFEST
Index: MANIFEST
===================================================================
RCS file: /home/cvs/modperl/MANIFEST,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- MANIFEST 2000/12/31 19:34:16 1.67
+++ MANIFEST 2001/07/06 20:08:25 1.68
@@ -227,6 +227,7 @@
apaci/load_modules.pl.PL
apaci/find_source.PL
apaci/apxs_cflags.PL
+apaci/perl_config.PL
apaci/mod_perl.exp
.gdbinit
INSTALL.simple
1.190 +10 -2 modperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/modperl/Makefile.PL,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- Makefile.PL 2001/07/06 13:40:50 1.189
+++ Makefile.PL 2001/07/06 20:08:27 1.190
@@ -163,6 +163,9 @@
gen_script("t/report");
gen_script("apaci/find_source");
gen_script("apaci/apxs_cflags");
+gen_script("apaci/perl_config", "$PWD/lib");
+gen_script("apaci/load_modules.pl");
+
write_version_h("src/modules/perl");
my(@test_pre_init) = qq(
@@ -417,7 +420,6 @@
if ($USE_APACI) {
print "Will configure via APACI";
- gen_script("apaci/load_modules.pl");
if($USE_DSO) {
print " (DSO enabled)";
}
@@ -603,6 +605,7 @@
open MANI, "MANIFEST" or die "open MANIFEST $!";
while(<MANI>) {
next unless m,^apaci/,; chomp;
+ s/\.PL$//;
(my $to = $_) =~ s,^apaci/,src/modules/perl/,;
unlink "$atopdir/$to";
print "cp $_ $atopdir/$to\n";
@@ -1909,10 +1912,15 @@
sub gen_script {
my $file = shift;
+ my(@lib) = @_;
local(*IN,*OUT);
open IN, "$file.PL" or die "Couldn't open $file.PL: $!";
open OUT, ">$file" or die "Couldn't open $file: $!";
- print OUT "#!$Config{perlpath}\n", join '', <IN>;
+ print OUT "#!$Config{perlpath}\n";
+ if (@lib) {
+ print OUT "use lib qw(@lib);\n";
+ }
+ print OUT join '', <IN>;
close OUT;
close IN;
chmod 0755, "$file";
1.287 +1 -3 modperl/ToDo
Index: ToDo
===================================================================
RCS file: /home/cvs/modperl/ToDo,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -r1.286 -r1.287
--- ToDo 2001/07/06 16:02:23 1.286
+++ ToDo 2001/07/06 20:08:28 1.287
@@ -9,7 +9,7 @@
- PERL5LIB foo
-- 1.25 Apache::ExtUtils fix broke elsewhere
+- 1.25 Apache::ExtUtils fix broke elsewhere (doug cannot reproduce)
- warn() going to the wrong log?
@@ -79,8 +79,6 @@
and Action unless mod_action, etc.
- Mac OS X
-
-- perl -MApache::ExtUtils=%Config does not work inside the apache tree
... docs ...
1.605 +3 -0 modperl/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl/Changes,v
retrieving revision 1.604
retrieving revision 1.605
diff -u -r1.604 -r1.605
--- Changes 2001/07/06 17:19:54 1.604
+++ Changes 2001/07/06 20:08:29 1.605
@@ -10,6 +10,9 @@
=item 1.25_01-dev
+make sure Apache::ExtUtils can be found when building inside of the
+apache source tree, thanks to Jonathan Swartz for the spot
+
add perl_call_handler to mod_perl.def for win32/axkit
[Randy Kobes <[EMAIL PROTECTED]>]
1.25 +13 -9 modperl/apaci/mod_perl.config.sh
Index: mod_perl.config.sh
===================================================================
RCS file: /home/cvs/modperl/apaci/mod_perl.config.sh,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- mod_perl.config.sh 2001/06/14 04:49:09 1.24
+++ mod_perl.config.sh 2001/07/06 20:08:36 1.25
@@ -107,15 +107,19 @@
# determine build tools and flags
#
-config_pm='-MApache::ExtUtils=%Config'
-#config_pm='-MConfig'
-perl_cc="`$perl_interp $config_pm -e 'print $Config{cc}'`"
-perl_ccflags="`$perl_interp $config_pm -e 'print $Config{ccflags}'`"
-perl_optimize="`$perl_interp $config_pm -e 'print $Config{optimize}'`"
-perl_cccdlflags="`$perl_interp $config_pm -e 'print $Config{cccdlflags}'`"
-perl_ld="`$perl_interp $config_pm -e 'print $Config{ld}'`"
-perl_ldflags="`$perl_interp $config_pm -e 'print $Config{ldflags}'`"
-perl_lddlflags="`$perl_interp $config_pm -e 'print $Config{lddlflags}'`"
+if test -f './modules/perl/perl_config'; then
+ perl_config='./modules/perl/perl_config'
+else
+ perl_config='./perl_config'
+fi
+
+perl_cc="`$perl_config 'cc'`"
+perl_ccflags="`$perl_config 'ccflags'`"
+perl_optimize="`$perl_config 'optimize'`"
+perl_cccdlflags="`$perl_config 'cccdlflags'`"
+perl_ld="`$perl_config 'ld'`"
+perl_ldflags="`$perl_config 'ldflags'`"
+perl_lddlflags="`$perl_config 'lddlflags'`"
case "$os_version" in
aix*)
1.5 +2 -1 modperl/apaci/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/modperl/apaci/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 2001/06/14 04:50:11 1.4
+++ .cvsignore 2001/07/06 20:08:37 1.5
@@ -7,4 +7,5 @@
Makefile
mod_perl.config
find_source
-apxs_cflags
\ No newline at end of file
+apxs_cflags
+perl_config
1.1 modperl/apaci/perl_config.PL
Index: perl_config.PL
===================================================================
#we generate this script simply to set @INC
#so Apache::ExtUtils can be found
use Apache::ExtUtils qw(%Config);
use strict;
my $key = shift;
print $Config{$key};
