You are viewing a plain text version of this content. The canonical link for it is here.
Posted to modperl-cvs@perl.apache.org by st...@apache.org on 2003/10/29 01:42:47 UTC
cvs commit: modperl-2.0 Makefile.PL
stas 2003/10/28 16:42:47
Modified: . Makefile.PL
Log:
constants don't survive MakeMaker's move of MY:: functions to a different
namespace, therefore use a lexical $apache_test_install instead of a
constant APACHE_TEST_INSTALL
Revision Changes Path
1.126 +5 -4 modperl-2.0/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -u -r1.125 -r1.126
--- Makefile.PL 21 Sep 2003 03:05:18 -0000 1.125
+++ Makefile.PL 29 Oct 2003 00:42:47 -0000 1.126
@@ -423,10 +423,11 @@
use Config;
+my $apache_test_install;
BEGIN {
- use constant APACHE_TEST_INSTALL => -e 'Apache-Test';
+ $apache_test_install = -e 'Apache-Test';
use lib './Apache-Test';
- require 'install-pl' if APACHE_TEST_INSTALL;
+ require 'install-pl' if $apache_test_install;
}
sub MY::top_targets {
@@ -465,7 +466,7 @@
EOF
$string .= Apache::Test::install::nuke_Apache__test_target()
- if APACHE_TEST_INSTALL();
+ if $apache_test_install;
$string;
}
@@ -477,7 +478,7 @@
ModPerl::MM::add_dep(\$string, pure_install => 'modperl_xs_h_install');
ModPerl::MM::add_dep(\$string, pure_install => 'nuke_Apache__test')
- if APACHE_TEST_INSTALL();
+ if $apache_test_install;
$string;
}