From 8c8e09c3054865f814d967fae444853d7ac8c671 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Sun, 13 Sep 2009 21:07:35 -0500
Subject: Restore AS vendor file until we get things sorted out in railties

---
 activesupport/lib/active_support.rb        |  1 +
 activesupport/lib/active_support/vendor.rb | 27 +++++++++++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 activesupport/lib/active_support/vendor.rb

(limited to 'activesupport')

diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb
index db3f33618e..4dcb6191df 100644
--- a/activesupport/lib/active_support.rb
+++ b/activesupport/lib/active_support.rb
@@ -35,6 +35,7 @@ module ActiveSupport
 end
 
 require 'active_support/autoload'
+require 'active_support/vendor'
 
 begin
   require 'i18n'
diff --git a/activesupport/lib/active_support/vendor.rb b/activesupport/lib/active_support/vendor.rb
new file mode 100644
index 0000000000..f9ecefe4e7
--- /dev/null
+++ b/activesupport/lib/active_support/vendor.rb
@@ -0,0 +1,27 @@
+# Prefer gems to the bundled libs.
+require 'rubygems'
+
+begin
+  gem 'builder', '~> 2.1.2'
+rescue Gem::LoadError
+  $:.unshift "#{File.dirname(__FILE__)}/vendor/builder-2.1.2/lib"
+end
+
+begin
+  gem 'memcache-client', '>= 1.6.5'
+rescue Gem::LoadError
+  $:.unshift "#{File.dirname(__FILE__)}/vendor/memcache-client-1.6.5/lib"
+end
+
+begin
+  gem 'tzinfo', '~> 0.3.13'
+rescue Gem::LoadError
+  $:.unshift "#{File.dirname(__FILE__)}/vendor/tzinfo-0.3.13/lib"
+end
+
+begin
+  gem 'i18n', '~> 0.1.3'
+rescue Gem::LoadError
+  $:.unshift "#{File.dirname(__FILE__)}/vendor/i18n-0.1.3/lib"
+  require 'i18n'
+end
-- 
cgit v1.2.3