Author: stevehay
Date: Tue Feb 21 08:59:19 2012
New Revision: 1291667
URL: http://svn.apache.org/viewvc?rev=1291667&view=rev
Log:
Ensure that MP_APXS is set when building on Win32 with MP_AP_PREFIX,
otherwise the bundled Reload and SizeLimit builds will fail to find a
properly configured Test environment.
Modified:
perl/modperl/trunk/Changes
perl/modperl/trunk/Makefile.PL
Modified: perl/modperl/trunk/Changes
URL:
http://svn.apache.org/viewvc/perl/modperl/trunk/Changes?rev=1291667&r1=1291666&r2=1291667&view=diff
==============================================================================
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Tue Feb 21 08:59:19 2012
@@ -12,6 +12,11 @@ Also refer to the Apache::Test changes l
=item 2.0.6-dev
+Ensure that MP_APXS is set when building on Win32 with MP_AP_PREFIX,
+otherwise the bundled Reload and SizeLimit builds will fail to find a
+properly configured Test environment.
+[Steve Hay]
+
Fix a few REFCNT bugs.
Patch submitted by: Niko Tyni <nt...@debian.org>
Reviewed by: Torsten Foertsch
Modified: perl/modperl/trunk/Makefile.PL
URL:
http://svn.apache.org/viewvc/perl/modperl/trunk/Makefile.PL?rev=1291667&r1=1291666&r2=1291667&view=diff
==============================================================================
--- perl/modperl/trunk/Makefile.PL (original)
+++ perl/modperl/trunk/Makefile.PL Tue Feb 21 08:59:19 2012
@@ -52,6 +52,7 @@ my $code = ModPerl::Code->new;
sub UNATTENDED() { $build->{MP_PROMPT_DEFAULT} || ! -t STDIN }
+# may populate $build->{MP_APXS}
win32_fetch_apxs() if WIN32;
configure();
@@ -623,6 +624,8 @@ sub win32_fetch_apxs {
my $script = catfile($build->{cwd}, 'build', 'win32_fetch_apxs');
my @args = ($^X, $script, "--with-apache2=$prefix");
system(@args) == 0 or die "system @args failed: $?";
+ my $apxs = catfile($prefix, 'bin', 'apxs.bat');
+ $build->{MP_APXS} = $apxs if -e $apxs;
}
