stas 2004/01/15 15:23:08
Modified: lib/ModPerl BuildOptions.pm
. Changes
Log:
if MP_AP_PREFIX is used apxs and apr-config from the apache build tree
won't work, so it can't co-exist with MP_APXS and MP_APR_CONFIG build
options - ensure that this doesn't happen.
Revision Changes Path
1.25 +13 -0 modperl-2.0/lib/ModPerl/BuildOptions.pm
Index: BuildOptions.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/lib/ModPerl/BuildOptions.pm,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -u -r1.24 -r1.25
--- BuildOptions.pm 15 Dec 2003 05:29:35 -0000 1.24
+++ BuildOptions.pm 15 Jan 2004 23:23:08 -0000 1.25
@@ -22,6 +22,19 @@
parse_file($build);
parse_argv($build);
+ # if AP_PREFIX is used apxs and apr-config from the apache build
+ # tree won't work, so it can't co-exist with APXS and APR_CONFIG
+ # options
+ if ($build->{MP_AP_PREFIX} and $build->{MP_APXS}) {
+ error "You need to pass either MP_AP_PREFIX or MP_APXS, but not both";
+ die "\n";
+ }
+ if ($build->{MP_AP_PREFIX} and $build->{MP_APR_CONFIG}) {
+ error "You need to pass either MP_AP_PREFIX or MP_APR_CONFIG, " .
+ "but not both";
+ die "\n";
+ }
+
if ($build->{MP_DEBUG} and $build->{MP_USE_GTOP} and !$build->find_gtop) {
error "Can't find libgtop, resetting MP_USE_GTOP=0";
$build->{MP_USE_GTOP} = 0;
1.302 +8 -4 modperl-2.0/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl-2.0/Changes,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -u -r1.301 -r1.302
--- Changes 14 Jan 2004 21:27:40 -0000 1.301
+++ Changes 15 Jan 2004 23:23:08 -0000 1.302
@@ -12,10 +12,14 @@
=item 1.99_13-dev
-server_root_relative() now requires either a valid pool or an $r, $s, or $c
-object as a first argument. also, the returned result is a copy, protecting
-against cases where the pool would go out of scope before the result.
-[Geoffrey Young]
+if MP_AP_PREFIX is used apxs and apr-config from the apache build tree
+won't work, so it can't co-exist with MP_APXS and MP_APR_CONFIG build
+options - ensure that this doesn't happen. [Stas]
+
+server_root_relative() now requires either a valid pool or an $r, $s,
+or $c object as a first argument. also, the returned result is a
+copy, protecting against cases where the pool would go out of scope
+before the result. [Geoffrey Young]
Check the success of sysopen in tmpfile() in compat [Geoffrey Young]
