lib/interlock.rb in interlock-1.1 vs lib/interlock.rb in interlock-1.2

@@ -1,23 +1,20 @@
 
 module Interlock
 end
 
-unless defined? MemCache or defined? MemCacheWithConsistentHashing
-  raise "Interlock requires the memcache-client gem"
-end
-
-if MemCache.constants.include?('SVNURL')
-  raise "You have the Ruby-MemCache gem installed. Interlock uses memcache-client. Please uninstall Ruby-MemCache, or otherwise guarantee that memcache-client will load instead."
-end
-
 require 'interlock/core_extensions'
 require 'interlock/config'
 require 'interlock/interlock'
-require 'interlock/memcached'
+require 'interlock/lock'
 require 'interlock/action_controller'
 require 'interlock/action_view'
 require 'interlock/active_record'
+
+begin
+  require 'memcached'
+rescue LoadError
+end
 
 unless ActionController::Base.perform_caching
   RAILS_DEFAULT_LOGGER.warn "** interlock warning; config.perform_caching == false"
 end