X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=cd83adc2fde5babada83b3b5f5958c8c4a57af4c;hb=ee26f4bd0cef4af7cebaf255664024c7bf92bb88;hp=f06caa9153e07156b04146112c6a67ef5b0ae6b9;hpb=d538823f7f54a6d1037d3933ab61af23aade6059;p=catagits%2FCatalyst-Runtime.git

diff --git a/Makefile.PL b/Makefile.PL
index f06caa9..cd83adc 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -6,6 +6,8 @@ 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');
@@ -32,14 +34,32 @@ 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');
+requires('ExtUtils::AutoInstall');
+
+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 +71,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 +83,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