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

diff --git a/Makefile.PL b/Makefile.PL
index 2314ce4..27e7206 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -35,11 +35,11 @@ requires('Tree::Simple');
 requires('Tree::Simple::Visitor::FindByPath');
 requires( 'URI' => 1.35 );
 requires('File::Copy::Recursive');
-requires('inc::Module::Install');
+requires('Module::Install::Admin');
 requires('ExtUtils::AutoInstall');
 
 features(
-    'Apache Support' => [
+    'Apache/mod_perl Support' => [
         -default                   => 0,
         'Catalyst::Engine::Apache' => '1.00'
     ],
@@ -52,8 +52,8 @@ features(
         -default => 0,
         'PAR'    => 0
     ],
-    'CPANPLUS' => [
-        -default   => 0,
+    'CPANPLUS (for easier installations)' => [
+        -default   => 1,
         'CPANPLUS' => 0
     ],
 );
@@ -83,9 +83,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.