X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=Makefile.PL;h=7ba87d8a337203ee02113898b24de44da82e7b20;hp=7b190341b1ee4107c07eeae74b468c87b9ff38a1;hb=8053d1f3759210b0bd7aa1c54fcb172ef9406e15;hpb=0afeb5f5303b4806e30c09cfae58e8448a64177a

diff --git a/Makefile.PL b/Makefile.PL
index 7b19034..7ba87d8 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');
@@ -33,15 +71,30 @@ requires('Tree::Simple');
 requires('Tree::Simple::Visitor::FindByPath');
 requires( 'URI' => 1.35 );
 requires('File::Copy::Recursive');
-requires('inc::Module::Install');
-
-recommends( 'Catalyst::Engine::Apache' => '1.00' );
-recommends('FCGI');
-recommends('FCGI::ProcManager');
-recommends('PAR');
+requires('Module::Install::Admin');
+
+features(
+    'Apache/mod_perl Support' => [
+        -default                   => 0,
+        'Catalyst::Engine::Apache' => '1.02'
+    ],
+    'FastCGI Support' => [
+        -default            => 0,
+        'FCGI'              => 0,
+        'FCGI::ProcManager' => 0
+    ],
+    'PAR Support' => [
+        -default => 0,
+        'PAR'    => 0
+    ],
+    'CPANPLUS (for easier installations)' => [
+        -default   => 0,
+        'CPANPLUS' => 0
+    ],
+);
 
 install_script( glob('script/*.pl') );
-
+auto_install();
 &WriteAll;
 
 print( '*' x 80, "\n" );
@@ -53,17 +106,6 @@ my $banner =
 print " $banner \n";
 print( '*' x 80, "\n" );
 
-print <<'EOF';
-
-                    ____      _        _           _
-                   / ___|__ _| |_ __ _| |_   _ ___| |_
-                  | |   / _` | __/ _` | | | | / __| __|
-                  | |__| (_| | || (_| | | |_| \__ \ |_
-                   \____\__ _|\__\__ _|_|\__  |___/\__|
-                                         |___/  carpe diem!
-
-EOF
-
 eval "use FCGI";
 print qq/ Install "FCGI" for FastCGI support.\n/ if $@;
 eval "use FCGI::ProcManager";
@@ -76,14 +118,11 @@ 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.
 
+        perl -MCPANPLUS -e 'install Task::Catalyst'
         perl -MCPAN -e 'install Task::Catalyst'
 
-
  Have fun!
 EOF