svn commit: r109376 - /perl/modperl/trunk/Changes /perl/modperl/trunk/Makefile.PL

[stas]

Author: stas
Date: Wed Dec  1 13:07:20 2004
New Revision: 109376

URL: http://svn.apache.org/viewcvs?view=rev&rev=109376
Log:
Dynamically prompt and add MP_INST_APACHE2=1 when installing on
systems with mod_perl 1 preinstalled.

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?view=diff&rev=109376&p1=perl/modperl/trunk/Changes&r1=109375&p2=perl/modperl/trunk/Changes&r2=109376
==============================================================================
--- perl/modperl/trunk/Changes  (original)
+++ perl/modperl/trunk/Changes  Wed Dec  1 13:07:20 2004
@@ -12,6 +12,9 @@
 
 =item 1.99_18-dev
 
+Dynamically prompt and add MP_INST_APACHE2=1 when installing on
+systems with mod_perl 1 preinstalled. [Stas]
+
 fix the logging call in RegistryCooker [Lars Eggert <lars.eggert
 netlab.nec.de>]
 

Modified: perl/modperl/trunk/Makefile.PL
Url: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/Makefile.PL?view=diff&rev=109376&p1=perl/modperl/trunk/Makefile.PL&r1=109375&p2=perl/modperl/trunk/Makefile.PL&r2=109376
==============================================================================
--- perl/modperl/trunk/Makefile.PL      (original)
+++ perl/modperl/trunk/Makefile.PL      Wed Dec  1 13:07:20 2004
@@ -146,11 +146,28 @@
                     "no collision)\n";
             }
             else {
-                error "not ok";
-                error "cannot install mod_perl/$VERSION on top of $vstring",
-                    "use MP_INST_APACHE2=1 option " .
-                     "or to force installation delete:\n $old_modperl_pm";
-                exit 1;
+                print " not ok\n\n";
+                error <<EOI;
+Cannot install mod_perl/$VERSION on top of $vstring.
+Add the MP_INST_APACHE2=1 option or answer 'yes'
+to the next question
+EOI
+                my $prompt = "Is it OK to install relative to Apache2/?";
+                if ($build->prompt_y($prompt)) {
+                    $build->{MP_INST_APACHE2} = 1;
+                }
+                else {
+                    error <<EOI;
+
+The answer is 'No' => aborting...
+
+To build mod_perl 2 either add MP_INST_APACHE2=1 Makefile.PL option
+or first remove mod_perl $old_modperl_version files, including
+$old_modperl_pm
+
+EOI
+                    exit 1;
+                }
             }
         }
     }