Return-Path: X-Original-To: apmail-perl-modperl-cvs-archive@www.apache.org Delivered-To: apmail-perl-modperl-cvs-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A3DDF9948 for ; Tue, 21 Feb 2012 08:58:08 +0000 (UTC) Received: (qmail 17105 invoked by uid 500); 21 Feb 2012 08:58:08 -0000 Delivered-To: apmail-perl-modperl-cvs-archive@perl.apache.org Received: (qmail 17085 invoked by uid 500); 21 Feb 2012 08:58:08 -0000 Mailing-List: contact modperl-cvs-help@perl.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@perl.apache.org List-Id: Delivered-To: mailing list modperl-cvs@perl.apache.org Received: (qmail 17077 invoked by uid 99); 21 Feb 2012 08:58:08 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Feb 2012 08:58:08 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Feb 2012 08:58:07 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id CF9AE238889B; Tue, 21 Feb 2012 08:57:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1291666 - in /perl/Apache-SizeLimit/trunk: Changes Makefile.PL Date: Tue, 21 Feb 2012 08:57:47 -0000 To: modperl-cvs@perl.apache.org From: stevehay@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120221085747.CF9AE238889B@eris.apache.org> 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;