From dcfd6aa3bd91c93adf6ed47453a084327f018000 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Tue, 15 Feb 2005 16:21:56 +0000
Subject: Move Controllers wrapper module away from environment.rb and into
 dependencies.rb

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@627 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 railties/lib/rails_generator.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails_generator.rb b/railties/lib/rails_generator.rb
index 3e7f459345..8268f3f5f0 100644
--- a/railties/lib/rails_generator.rb
+++ b/railties/lib/rails_generator.rb
@@ -23,7 +23,12 @@
 
 $:.unshift(File.dirname(__FILE__))
 
-require 'active_support'
+begin
+  require 'active_support'
+rescue LoadError
+  require 'rubygems'
+  require_gem 'activesupport'
+end
 
 require 'rails_generator/base'
 require 'rails_generator/lookup'
-- 
cgit v1.2.3