Mailing-List: contact modperl-cvs-help@perl.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@perl.apache.org
Message-ID: <20050426193638.7485.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Subject: svn commit: r164866 - in /perl/modperl/trunk: Changes Makefile.PL
Date: Tue, 26 Apr 2005 19:36:37 -0000
To: modperl-cvs@perl.apache.org
From: stas@apache.org

Author: stas
Date: Tue Apr 26 12:36:36 2005
New Revision: 164866

URL: http://svn.apache.org/viewcvs?rev=3D164866&view=3Drev
Log:
improve the diagnostics when detecting mp2 < 1.999022, tell the user
which files and/or dirs need to be removed

Modified:
    perl/modperl/trunk/Changes
    perl/modperl/trunk/Makefile.PL

Modified: perl/modperl/trunk/Changes
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?rev=3D164866&=
r1=3D164865&r2=3D164866&view=3Ddiff
=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/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Tue Apr 26 12:36:36 2005
@@ -12,6 +12,9 @@
=20
 =3Ditem 1.999_23-dev
=20
+improve the diagnostics when detecting mp2 < 1.999022, tell the user
+which files and/or dirs need to be removed [Stas]
+
 restore the DESTDIR support partially nuked by the apache2 rename
 branch [Torsten F=C3=B6rtsch <torsten.foertsch gmx.net>]
=20

Modified: perl/modperl/trunk/Makefile.PL
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/Makefile.PL?rev=3D164=
866&r1=3D164865&r2=3D164866&view=3Ddiff
=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/modperl/trunk/Makefile.PL (original)
+++ perl/modperl/trunk/Makefile.PL Tue Apr 26 12:36:36 2005
@@ -9,7 +9,7 @@
 use constant MIN_HTTPD_VERSION_DYNAMIC =3D> '2.0.47';
 use constant MIN_HTTPD_VERSION_STATIC  =3D> '2.0.51';
=20
-my($old_modperl_version, $old_modperl_pm);
+my($old_modperl_version, $old_modperl_pm, $old_Apache2_pm);
=20
 BEGIN {
     eval {
@@ -18,6 +18,7 @@
         if ($mod_perl::VERSION < 1.999_22 && $old_mp2) {
             $old_modperl_version =3D $mod_perl::VERSION;
             $old_modperl_pm =3D delete $INC{'mod_perl.pm'};
+            $old_Apache2_pm =3D delete $INC{'Apache2.pm'};
         }
     };
 }
@@ -142,10 +143,25 @@
                 "no collision)\n";
         }
         else {
+            my @files =3D ();
+            my @dirs =3D ();
+            push @files, $old_Apache2_pm if $old_Apache2_pm;
+            push @dirs, $path
+                if $path =3D~ /Apache2/ or $old_modperl_version > 1.99;
+
+            my $note =3D '';
+            if (@files || @dirs) {
+                $note  =3D "Problematic\n";
+                $note .=3D "files: @files\n" if @files;
+                $note .=3D "dirs: @dirs\n"   if @dirs;
+            }
+
             print " not ok\n\n";
             print <<EOI;
 Cannot install mod_perl/$VERSION on top of $vstring
 due to a major API change between mod_perl 1.999_21 and 1.999_22.
+
+$note
 Please nuke the prior mod_perl installation from your site_lib,
 use a different perl to run the installation process, or use the
 PREFIX option when creating your Makefile.  see