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 st...@apache.org on 2003/03/14 02:51:50 UTC
cvs commit: modperl-2.0/lib/ModPerl MM.pm
stas 2003/03/13 17:51:50
Modified: lib/ModPerl MM.pm
Log:
add a temp workaround for mod_perl's fresh install, when -MApache2 fails, since it's not
installed yet.
Revision Changes Path
1.23 +9 -2 modperl-2.0/lib/ModPerl/MM.pm
Index: MM.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/lib/ModPerl/MM.pm,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- MM.pm 4 Feb 2003 01:53:36 -0000 1.22
+++ MM.pm 14 Mar 2003 01:51:50 -0000 1.23
@@ -12,9 +12,16 @@
#to override MakeMaker MOD_INSTALL macro
sub mod_install {
# XXX: adding -MApache2 here so 3rd party modules could use this macro,
+ # taking into account that we can't do -MApache2 when installing
+ # mod_perl itself, when installed for the first time.
# may be should have different macros for core build and modules build
- q{$(PERL) -I$(INST_LIB) -I$(PERL_LIB) -MApache2 -MModPerl::MM \\}."\n" .
- q{-e "ModPerl::MM::install({@ARGV},'$(VERBINST)',0,'$(UNINST)');"}."\n";
+ q{$(PERL) -I$(INST_LIB) -I$(PERL_LIB) \\}."\n" .
+ q{-e "BEGIN { eval {require Apache2} } use ModPerl::MM; \\}."\n" .
+ q{ModPerl::MM::install({@ARGV},'$(VERBINST)',0,'$(UNINST)');"}."\n";
+
+ # the original was:
+ # q{$(PERL) -I$(INST_LIB) -I$(PERL_LIB) -MModPerl::MM \\}."\n" .
+ # q{-e "ModPerl::MM::install({@ARGV},'$(VERBINST)',0,'$(UNINST)');"}."\n";
}
sub add_dep {