Return-Path: Delivered-To: apmail-perl-test-commits-archive@www.apache.org Received: (qmail 69193 invoked from network); 8 Mar 2005 03:15:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 8 Mar 2005 03:15:54 -0000 Received: (qmail 86269 invoked by uid 500); 8 Mar 2005 03:15:53 -0000 Mailing-List: contact test-commits-help@perl.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: test-dev@perl.apache.org Delivered-To: mailing list test-commits@perl.apache.org Received: (qmail 86255 invoked by uid 99); 8 Mar 2005 03:15:53 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Mon, 07 Mar 2005 19:15:53 -0800 Received: (qmail 69181 invoked by uid 65534); 8 Mar 2005 03:15:52 -0000 Message-ID: <20050308031552.69180.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Tue, 08 Mar 2005 03:15:52 -0000 Subject: svn commit: r156487 - perl/Apache-Test/branches/apache2-rename-unstable/Apache-TestItSelf/Apache-TestMe/Makefile.PL To: test-commits@perl.apache.org From: joes@apache.org X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: joes Date: Mon Mar 7 19:15:51 2005 New Revision: 156487 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D156487 Log: mp detection logic split into require_mod_perl() and require_mod_perl2(), matching mod_perl2.pm rename. Modified: perl/Apache-Test/branches/apache2-rename-unstable/Apache-TestItSelf/Apa= che-TestMe/Makefile.PL Modified: perl/Apache-Test/branches/apache2-rename-unstable/Apache-TestItSe= lf/Apache-TestMe/Makefile.PL URL: http://svn.apache.org/viewcvs/perl/Apache-Test/branches/apache2-rename= -unstable/Apache-TestItSelf/Apache-TestMe/Makefile.PL?view=3Ddiff&r1=3D1564= 86&r2=3D156487 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- perl/Apache-Test/branches/apache2-rename-unstable/Apache-TestItSelf/Apa= che-TestMe/Makefile.PL (original) +++ perl/Apache-Test/branches/apache2-rename-unstable/Apache-TestItSelf/Apa= che-TestMe/Makefile.PL Mon Mar 7 19:15:51 2005 @@ -80,16 +80,14 @@ } elsif ($wanted =3D=3D 2) { #warn "Looking for mod_perl 2.0"; - require Apache2; - require_mod_perl(); + require_mod_perl2(); if ($mod_perl::VERSION < 1.99) { die "You don't seem to have mod_perl 2.0 installed"; } $selected =3D 2; } else { - require_mod_perl(); - $selected =3D $mod_perl::VERSION >=3D 1.99 ? 2 : 1; + $selected =3D eval { require_mod_perl2() or require_mod_perl() }; warn "Using $mod_perl::VERSION\n"; } =20 @@ -99,6 +97,13 @@ sub require_mod_perl { eval { require mod_perl }; die "Can't find mod_perl installed\nThe error was: $@" if $@; + 1; +} + +sub require_mod_perl2 { + eval { require mod_perl2 }; + die "Can't find mod_perl installed\nThe error was: $@" if $@; + 2; } =20 =20 @@ -149,7 +154,7 @@ =20 unless ($wanted) { # if still unknown try to require mod_perl.pm - eval { require mod_perl }; + eval { require mod_perl2 or require mod_perl }; unless ($@) { $wanted =3D $mod_perl::VERSION >=3D 1.99 ? 2 : 1; } @@ -206,7 +211,7 @@ =20 unless ($wanted) { # if still unknown try to require mod_perl.pm - eval { require mod_perl }; + eval { require mod_perl2 or require mod_perl }; unless ($@) { $wanted =3D $mod_perl::VERSION >=3D 1.99 ? 2 : 1; }