Author: geoff
Date: Thu Apr 7 06:15:39 2005
New Revision: 160402
URL: http://svn.apache.org/viewcvs?view=rev&rev=160402
Log:
get old 1.99 detection (versus mp1) correct
Modified:
perl/modperl/trunk/Makefile.PL
Modified: perl/modperl/trunk/Makefile.PL
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/Makefile.PL?view=diff&r1=160401&r2=160402
==============================================================================
--- perl/modperl/trunk/Makefile.PL (original)
+++ perl/modperl/trunk/Makefile.PL Thu Apr 7 06:15:39 2005
@@ -9,14 +9,13 @@
use constant MIN_HTTPD_VERSION_DYNAMIC => '2.0.47';
use constant MIN_HTTPD_VERSION_STATIC => '2.0.51';
-my($old_modperl_version, $old_modperl_pm, $apache2_pm);
+my($old_modperl_version, $old_modperl_pm);
BEGIN {
eval {
- require Apache2;
- $apache2_pm = 1;
require mod_perl;
- if ($mod_perl::VERSION < 1.999_22) {
+ my $old_mp2 = eval { require Apache2 };
+ if ($mod_perl::VERSION < 1.999_22 && $old_mp2) {
$old_modperl_version = $mod_perl::VERSION;
$old_modperl_pm = delete $INC{'mod_perl.pm'};
}
@@ -160,7 +159,7 @@
}
}
else {
- print "no prior mod_perl version found - good.\n";
+ print "no conflicting prior mod_perl version found - good.\n";
}
