AR, AP, and AM should look for AS in sibling directory before trying RubyGems #648

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@648 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

actionmailer/lib/action_mailer.rb

@@ -24,9 +24,12 @@
 begin
   require 'action_controller'
 rescue LoadError
-  # Action Pack is not already available, try RubyGems
-  require 'rubygems'	
-  require_gem 'actionpack', '>= 0.9.0'
+  begin
+    require File.dirname(__FILE__) + '/../../actionpack/lib/action_controller'
+  rescue LoadError
+    require 'rubygems'
+    require_gem 'actionpack', '>= 0.9.0'
+  end
 end
 
 $:.unshift(File.dirname(__FILE__) + "/action_mailer/vendor/")

actionpack/lib/action_controller.rb

@@ -26,8 +26,12 @@ $:.unshift(File.dirname(__FILE__))
 begin
   require 'active_support'
 rescue LoadError
-  require 'rubygems'
-  require_gem 'activesupport'
+  begin
+    require File.dirname(__FILE__) + '/../../activesupport/lib/active_support'
+  rescue LoadError
+    require 'rubygems'
+    require_gem 'activesupport'
+  end
 end
 
 require 'action_controller/base'

actionpack/lib/action_view.rb

@@ -22,7 +22,7 @@
 #++
 
 begin
-  require 'rubygems'	
+  require 'rubygems'
   require 'builder'
 rescue LoadError
   # RubyGems is not available, use included Builder

activerecord/lib/active_record.rb

@@ -27,8 +27,12 @@ $:.unshift(File.dirname(__FILE__))
 begin
   require 'active_support'
 rescue LoadError
-  require 'rubygems'
-  require_gem 'activesupport'
+  begin
+    require File.dirname(__FILE__) + '/../../activesupport/lib/active_support'
+  rescue LoadError
+    require 'rubygems'
+    require_gem 'activesupport'
+  end
 end
 
 require 'active_record/base'