Return-Path: Delivered-To: apmail-httpd-test-cvs-archive@httpd.apache.org Received: (qmail 14271 invoked by uid 500); 22 Apr 2003 08:09:49 -0000 Mailing-List: contact test-cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: test-dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list test-cvs@httpd.apache.org Received: (qmail 14260 invoked from network); 22 Apr 2003 08:09:48 -0000 Date: 22 Apr 2003 08:09:47 -0000 Message-ID: <20030422080947.79306.qmail@icarus.apache.org> From: stas@apache.org To: httpd-test-cvs@apache.org Subject: cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestConfig.pm X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N stas 2003/04/22 01:09:47 Modified: perl-framework/Apache-Test/lib/Apache TestConfig.pm Log: define a new constant IS_MOD_PERL_2_BUILD so we can use it elsewhere Revision Changes Path 1.153 +5 -5 httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm Index: TestConfig.pm =================================================================== RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm,v retrieving revision 1.152 retrieving revision 1.153 diff -u -r1.152 -r1.153 --- TestConfig.pm 16 Apr 2003 04:55:01 -0000 1.152 +++ TestConfig.pm 22 Apr 2003 08:09:47 -0000 1.153 @@ -11,6 +11,10 @@ use constant DEFAULT_PORT => 8529; +use constant IS_MOD_PERL_2_BUILD => + eval { require mod_perl } && $mod_perl::VERSION >= 1.99 && + eval { require Apache::Build } && Apache::Build::IS_MOD_PERL_BUILD(); + use Symbol (); use File::Copy (); use File::Find qw(finddepth); @@ -113,11 +117,7 @@ sub server { shift->{server} } sub modperl_2_inc_fixup { - - (eval { require mod_perl } && $mod_perl::VERSION >= 1.99 && - eval { require Apache::Build } && !Apache::Build::IS_MOD_PERL_BUILD()) - ? "use Apache2;\n" - : ''; + IS_MOD_PERL_2_BUILD ? '' : "use Apache2;\n"; } sub modperl_build_config {