perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From steve...@apache.org
Subject svn commit: r1291666 - in /perl/Apache-SizeLimit/trunk: Changes Makefile.PL
Date Tue, 21 Feb 2012 08:57:47 GMT
Author: stevehay
Date: Tue Feb 21 08:57:47 2012
New Revision: 1291666

URL: http://svn.apache.org/viewvc?rev=1291666&view=rev
Log:
Set the -apxs argument correctly when building from mod_perl.
This may actually be unnecessary since revision 1023549, 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-SizeLimit/trunk/Changes
    perl/Apache-SizeLimit/trunk/Makefile.PL

Modified: perl/Apache-SizeLimit/trunk/Changes
URL: http://svn.apache.org/viewvc/perl/Apache-SizeLimit/trunk/Changes?rev=1291666&r1=1291665&r2=1291666&view=diff
==============================================================================
--- perl/Apache-SizeLimit/trunk/Changes (original)
+++ perl/Apache-SizeLimit/trunk/Changes Tue Feb 21 08:57:47 2012
@@ -8,6 +8,9 @@ Changes - Apache::SizeLimit change logfi
 
 =item 0.97-dev
 
+Set the -apxs argument correctly when building from mod_perl.
+[Steve Hay]
+
 =item 0.96 2011-12-21
 
 eval Linux::Smaps->new call when checking for /proc/self/smaps

Modified: perl/Apache-SizeLimit/trunk/Makefile.PL
URL: http://svn.apache.org/viewvc/perl/Apache-SizeLimit/trunk/Makefile.PL?rev=1291666&r1=1291665&r2=1291666&view=diff
==============================================================================
--- perl/Apache-SizeLimit/trunk/Makefile.PL (original)
+++ perl/Apache-SizeLimit/trunk/Makefile.PL Tue Feb 21 08:57:47 2012
@@ -8,8 +8,10 @@ my %mp1 = ( mod_perl  => 0 );
 my $at_min_ver = 1.36;
 
 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 {
@@ -66,10 +68,6 @@ else {
                               );
 }
 
-if ($ENV{MOD_PERL_2_BUILD}) {
-    pop @ARGV;
-}
-
 sub check_for_apache_test {
     return unless eval {
         require Apache::Test;



Mime
View raw message