Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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.

git-svn-id: https://svn.apache.org/repos/asf/perl/modperl/trunk@1291667 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
commit 7d4fe49c30d92be1d38f4e5884c4487767b91a73 1 parent c658d34
Steve Hay authored
Showing with 8 additions and 0 deletions.
  1. +5 −0 Changes
  2. +3 −0  Makefile.PL
View
5 Changes
@@ -12,6 +12,11 @@ Also refer to the Apache::Test changes log file, at Apache-Test/Changes
=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 <ntyni@debian.org>
Reviewed by: Torsten Foertsch
View
3  Makefile.PL
@@ -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;
}
Please sign in to comment.
Something went wrong with that request. Please try again.