X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=35cd9dfb964bc66e2d88e3ce9b4f697b475bf197;hb=474c164bd60fb3c9b2decb1c7b9be98f3f28deb8;hp=c195c017640b2ce9f4680c09f3a7cc32a295486a;hpb=a5b5152b19a887f87a0abac998f2086ac2e6920b;p=catagits%2FCatalyst-Runtime.git

diff --git a/Makefile.PL b/Makefile.PL
index c195c01..35cd9df 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,5 +1,19 @@
 use inc::Module::Install;
 
+# 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"}}}
+
 name('Catalyst');
 abstract('Catalyst Web Framework');
 author('Sebastian Riedel');
@@ -32,14 +46,31 @@ requires('Time::HiRes');
 requires('Tree::Simple');
 requires('Tree::Simple::Visitor::FindByPath');
 requires( 'URI' => 1.35 );
-
-recommends( 'Catalyst::Engine::Apache' => '1.00' );
-recommends('FCGI');
-recommends('FCGI::ProcManager');
-recommends('PAR');
+requires('File::Copy::Recursive');
+requires('Module::Install::Admin');
+
+features(
+    'Apache/mod_perl Support' => [
+        -default                   => 0,
+        'Catalyst::Engine::Apache' => '1.00'
+    ],
+    '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" );
@@ -51,17 +82,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";
@@ -74,14 +94,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 Bundle::Catalyst to get everything you need to write serious
-    applications.
-
-        perl -MCPAN -e 'install Bundle::Catalyst'
+    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