1 files changed, 14 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index 8ed5fda595..30245e934a 100755
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -23,10 +23,20 @@
 
 $:.unshift(File.dirname(__FILE__))
 
-require 'action_controller/support/core_ext'
-require 'action_controller/support/clean_logger'
-require 'action_controller/support/misc'
-require 'action_controller/support/dependencies'
+begin
+  require 'active_support/core_ext'
+  require 'active_support/clean_logger'
+  require 'active_support/misc'
+  require 'active_support/dependencies'
+rescue LoadError
+  require 'rubygems'
+  require_gem 'activesupport'
+  
+  require 'active_support/core_ext'
+  require 'active_support/clean_logger'
+  require 'active_support/misc'
+  require 'active_support/dependencies'
+end
 
 require 'action_controller/base'
 require 'action_controller/rescue'