X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=Makefile.PL;h=867326bd1b186b7ee885575169894a4bdc8ac63d;hp=2314ce4ac582075f950706de05c83761e7044ed5;hb=022d1311a5927d7020a36ea25462f2f00e8bb01f;hpb=9624cd13b2e160bcf70784157e9527d64c900687

diff --git a/Makefile.PL b/Makefile.PL
index 2314ce4..867326b 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,3 +1,41 @@
+# ExtUtils::AutoInstall Bootstrap Code, version 7.
+BEGIN {
+    my $p = 'ExtUtils::AutoInstall';
+    my $v = 0.45;
+    $p->VERSION || 0 >= $v
+      or +eval "use $p $v;1"
+      or +do {
+        my $e = $ENV{PERL_EXTUTILS_AUTOINSTALL};
+        (
+            !defined($e) || $e !~ m/--(?:default|skip|testonly)/ and -t STDIN
+              or eval
+              "use ExtUtils::MakeMaker;WriteMakefile(PREREQ_PM=>{'$p',$v}
+);1" and exit
+          )
+          and print "==> $p $v required. Install it from CP" . "AN? [Y/n] "
+          and <STDIN> !~ /^n/i
+          and print "*** Installing $p\n"
+          and do {
+            if ( eval '$>' and lc(`sudo -V`) =~ /version/ ) {
+                system( 'sudo', $^X, "-MCPANPLUS", "-e",
+                    "CPANPLUS::install $p" );
+                eval "use $p $v;1"
+                  || system( 'sudo', $^X, "-MCPAN", "-e", "CPAN::install $p" );
+            }
+            eval {
+                require CPANPLUS;
+                CPANPLUS::install $p;
+            };
+            eval "use $p $v;1" or eval {
+                require CPAN;
+                CPAN::install $p;
+            };
+            eval "use $p $v;1" || die "*** Please
+manually install $p $v from cpan.org first...\n";
+          }
+      }
+}
+
 use inc::Module::Install;
 
 name('Catalyst');
@@ -6,8 +44,6 @@ author('Sebastian Riedel');
 version_from('lib/Catalyst.pm');
 license('perl');
 
-include('ExtUtils::AutoInstall');
-
 requires( 'perl'               => '5.8.1' );
 requires( 'UNIVERSAL::require' => "0.10" );
 requires('Class::Accessor::Fast');
@@ -35,11 +71,10 @@ requires('Tree::Simple');
 requires('Tree::Simple::Visitor::FindByPath');
 requires( 'URI' => 1.35 );
 requires('File::Copy::Recursive');
-requires('inc::Module::Install');
-requires('ExtUtils::AutoInstall');
+requires('Module::Install::Admin');
 
 features(
-    'Apache Support' => [
+    'Apache/mod_perl Support' => [
         -default                   => 0,
         'Catalyst::Engine::Apache' => '1.00'
     ],
@@ -52,7 +87,7 @@ features(
         -default => 0,
         'PAR'    => 0
     ],
-    'CPANPLUS' => [
+    'CPANPLUS (for easier installations)' => [
         -default   => 0,
         'CPANPLUS' => 0
     ],
@@ -83,9 +118,6 @@ print qq/ Install "PAR" for PAR packaging support.\n/ if $@;
 print <<"EOF";
 
  Important:
-    The Apache engines have been moved to a separate package in Catalyst 5.5.
-    Please install Catalyst::Engine::Apache if you need Apache support.
-
     Install Task::Catalyst to get everything you need to start writing
     serious applications with Catalyst.