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 2012/02/21 09:55:08 UTC
svn commit: r1291665 - in /perl/Apache-Reload/trunk: Changes Makefile.PL
Author: stevehay
Date: Tue Feb 21 08:55:08 2012
New Revision: 1291665
URL: http://svn.apache.org/viewvc?rev=1291665&view=rev
Log:
Set the -apxs argument correctly when building from mod_perl.
This may actually be unnecessary since revision 1023551, which removed
the code that made check_for_apache_test() return 0 if no suitable
environment is found, but it still seems worthwhile to set -apxs
correctly rather than wrongly!
Modified:
perl/Apache-Reload/trunk/Changes
perl/Apache-Reload/trunk/Makefile.PL
Modified: perl/Apache-Reload/trunk/Changes
URL: http://svn.apache.org/viewvc/perl/Apache-Reload/trunk/Changes?rev=1291665&r1=1291664&r2=1291665&view=diff
==============================================================================
--- perl/Apache-Reload/trunk/Changes (original)
+++ perl/Apache-Reload/trunk/Changes Tue Feb 21 08:55:08 2012
@@ -8,14 +8,17 @@ Changes - Apache::Reload change logfile
=item 0.12-dev
+Set the -apxs argument correctly when building from mod_perl.
+[Steve Hay]
+
Doc spelling fix
[Nicholas Bamber]
-=item 0.11 August 21, 2010
-
Add Apache-Test 1.34 dependency.
[Phred]
+=item 0.11 August 21, 2010
+
Ignore require-hooks which exist in %INC
[Ryan Gies <ry...@livesite.net>]
Modified: perl/Apache-Reload/trunk/Makefile.PL
URL: http://svn.apache.org/viewvc/perl/Apache-Reload/trunk/Makefile.PL?rev=1291665&r1=1291664&r2=1291665&view=diff
==============================================================================
--- perl/Apache-Reload/trunk/Makefile.PL (original)
+++ perl/Apache-Reload/trunk/Makefile.PL Tue Feb 21 08:55:08 2012
@@ -8,8 +8,10 @@ my %mp1 = ( mod_perl => 0 );
my $at_min_ver = 1.34;
my $mp_gen;
+# MOD_PERL_2_BUILD is set from building from mod_perl Makefile.PL which should
+# also set MP_APXS
if ($ENV{MOD_PERL_2_BUILD}) {
- push @ARGV, "-apxs $ENV{MP_APXS}";
+ push @ARGV, "-apxs", $ENV{MP_APXS};
my $mp_gen = satisfy_mp_generation(2);
}
else {
@@ -45,11 +47,6 @@ else {
);
}
-# MOD_PERL_2_BUILD is set from building from mod_perl Makefile.PL
-if ($ENV{MOD_PERL_2_BUILD}) {
- pop @ARGV;
-}
-
sub check_for_apache_test {
return unless eval {
require Apache::Test;