dougm 01/06/13 21:49:10
Modified: . Changes Makefile.PL
src/modules/perl mod_perl.c
apaci mod_perl.config.sh
Log:
if PREFIX is given to Makefile.PL add it to @INC at startup
Revision Changes Path
1.597 +3 -0 modperl/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl/Changes,v
retrieving revision 1.596
retrieving revision 1.597
diff -u -r1.596 -r1.597
--- Changes 2001/06/14 04:44:11 1.596
+++ Changes 2001/06/14 04:49:07 1.597
@@ -10,6 +10,9 @@
=item 1.25_01-dev
+if PREFIX is given to Makefile.PL add it to @INC at startup
+[Philippe M . Chiasson <[EMAIL PROTECTED]>]
+
add %Apache::MyConfig aliases for Apache::src backwards compat
[Philippe M . Chiasson <[EMAIL PROTECTED]>]
1.186 +15 -0 modperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/modperl/Makefile.PL,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- Makefile.PL 2001/06/14 04:44:11 1.185
+++ Makefile.PL 2001/06/14 04:49:07 1.186
@@ -228,6 +228,7 @@
$PERL_CONNECTION_API = 1; #these two were split out late in the game
$PERL_SERVER_API = 1; #so they are on by default
$PERL_RUN_XS = 0;
+$MOD_PERL_PREFIX;
my %experimental = map { $_,1 } qw{
PERL_AUTOPRELOAD
@@ -336,6 +337,13 @@
unless (/^(PERL|APACHE)/ or is_mp_arg($k)) {
push @mm_args, $_;
}
+
+ if($k eq 'PREFIX')
+ {
+ use File::Spec;
+ $MOD_PERL_PREFIX =
File::Spec->catfile($v,'lib','site_perl',$Config{'version'},$Config{'archname'});
+ }
+
$v = 1 unless defined $v;
if($experimental{$k}) {
$experimental{$k}++;
@@ -2271,6 +2279,13 @@
LIBPERL = $LIBPERL
$static_targets
+
+EOF
+
+print $apaci_cfg <<EOF if defined $MOD_PERL_PREFIX;
+
+# mod_perl installation prefix
+MOD_PERL_PREFIX = $MOD_PERL_PREFIX
EOF
1.137 +5 -0 modperl/src/modules/perl/mod_perl.c
Index: mod_perl.c
===================================================================
RCS file: /home/cvs/modperl/src/modules/perl/mod_perl.c,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- mod_perl.c 2001/04/17 22:01:18 1.136
+++ mod_perl.c 2001/06/14 04:49:08 1.137
@@ -765,6 +765,11 @@
TAINT_NOT; /* At this time all is safe */
}
+#ifdef MOD_PERL_PREFIX
+ av_unshift(GvAV(incgv),1);
+ av_store(GvAV(incgv), 0, newSVpv(MOD_PERL_PREFIX,0));
+#endif
+
#ifdef APACHE_PERL5LIB
perl_incpush(APACHE_PERL5LIB);
#else
1.24 +5 -0 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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- mod_perl.config.sh 2001/01/29 18:11:41 1.23
+++ mod_perl.config.sh 2001/06/14 04:49:09 1.24
@@ -182,6 +182,11 @@
perl_defs=''
perl_defs="$perl_defs -DMOD_PERL_VERSION=\\\"$param_MOD_PERL_VERSION\\\""
perl_defs="$perl_defs
-DMOD_PERL_STRING_VERSION=\\\"mod_perl/$param_MOD_PERL_VERSION\\\""
+
+if [ ".$param_MOD_PERL_PREFIX" != . ]; then
+ perl_defs="$perl_defs -DMOD_PERL_PREFIX=\\\"$param_MOD_PERL_PREFIX\\\""
+fi
+
perl_defs="$perl_defs"
OIFS="$IFS" IFS="$DIFS"
for hook in \
