2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index dc3c47b0ef..032f093b87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat May 29 09:34:32 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/envutil.rb: fix for --disable-gems.
+
 Sat May 29 09:04:06 2010  Tanaka Akira  <akr@fsij.org>
 
 	* lib/resolv.rb (Resolv::DNS::Requester#request): rescue ECONNREFUSED.
diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb
index 65b2f77915..c5215e4bdd 100644
--- a/test/ruby/envutil.rb
+++ b/test/ruby/envutil.rb
@@ -216,6 +216,6 @@ else
     CONFIG['bindir'] = dir
     CONFIG['ruby_install_name'] = name
     CONFIG['RUBY_INSTALL_NAME'] = name
-    Gem::ConfigMap[:bindir] = dir
+    Gem::ConfigMap[:bindir] = dir if defined?(Gem)
   end
 end