X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=1ec5dbd24556501dd84d3b32c3cabdc57a96e211;hb=57c8e3b417327c2c3ba871b8ecd5e61540a2cf2f;hp=bd568f8af2189eca3f9d05b6bf87be40a033f7d0;hpb=e7d20a58cafa085173cedca883890008a9c37430;p=catagits%2FCatalyst-Runtime.git

diff --git a/Makefile.PL b/Makefile.PL
index bd568f8..1ec5dbd 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');
@@ -34,15 +36,30 @@ requires('Tree::Simple::Visitor::FindByPath');
 requires( 'URI' => 1.35 );
 requires('File::Copy::Recursive');
 requires('inc::Module::Install');
+requires('ExtUtils::AutoInstall');
 
-recommends( 'Catalyst::Engine::Apache' => '1.00' );
-recommends('FCGI');
-recommends('FCGI::ProcManager');
-recommends('PAR');
-recommends('CPANPLUS');
+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   => 1,
+        'CPANPLUS' => 0
+    ],
+);
 
 install_script( glob('script/*.pl') );
-
+auto_install();
 &WriteAll;
 
 print( '*' x 80, "\n" );
@@ -66,15 +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