X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst.pm;h=277395486feff460845a1b16b56ac2e68be78cc7;hp=be14489c60d443c445055a3ce32f7272836648dc;hb=afb208aeab7189202c63f892e2776371c7213462;hpb=316bf0f004c0de103e628994a4384e6cf4b45377

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index be14489..2773954 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -11,7 +11,7 @@ our $CATALYST_SCRIPT_GEN = 4;
 
 __PACKAGE__->mk_classdata($_) for qw/dispatcher engine log/;
 
-our $VERSION = '5.20';
+our $VERSION = '5.24';
 our @ISA;
 
 =head1 NAME
@@ -167,7 +167,7 @@ sub import {
                 $engine = 'Catalyst::Engine::Apache::MP20';
 
                 if ( Apache2::Request->require ) {
-                    $engine = 'Catalyst::Engine::Apache::MP20::APR';
+                    $engine = 'Catalyst::Engine::Apache::MP20::Apreq';
                 }
             }
 
@@ -176,7 +176,7 @@ sub import {
                 $engine = 'Catalyst::Engine::Apache::MP19';
 
                 if ( Apache::Request->require ) {
-                    $engine = 'Catalyst::Engine::Apache::MP19::APR';
+                    $engine = 'Catalyst::Engine::Apache::MP19::Apreq';
                 }
             }
 
@@ -185,7 +185,7 @@ sub import {
                 $engine = 'Catalyst::Engine::Apache::MP13';
 
                 if ( Apache::Request->require ) {
-                    $engine = 'Catalyst::Engine::Apache::MP13::APR';
+                    $engine = 'Catalyst::Engine::Apache::MP13::Apreq';
                 }
             }
 
@@ -284,6 +284,35 @@ sub import {
 
     # Find home
     my $home = Catalyst::Utils::home($caller);
+
+    if ( my $h = $ENV{CATALYST_HOME} ) {
+
+        $home = $h if -d $h;
+
+        unless ( -e _ ) {
+            $caller->log->warn(qq/CATALYST_HOME does not exist "$h"/);
+        }
+
+        unless ( -e _ && -d _ ) {
+            $caller->log->warn(qq/CATALYST_HOME is not a directory "$h"/);
+        }
+    }
+
+    if ( my $h = $ENV{ uc($caller) . '_HOME' } ) {
+
+        $home = $h if -d $h;
+
+        unless ( -e _ ) {
+            my $e = uc($caller) . '_HOME';
+            $caller->log->warn(qq/$e does not exist "$h"/)
+        }
+
+        unless ( -e _ && -d _ ) {
+            my $e = uc($caller) . '_HOME';
+            $caller->log->warn(qq/$e is not a directory "$h"/);
+        }
+    }
+    
     if ( $caller->debug ) {
         $home
           ? ( -d $home )