From ca6a75cd38c97774b2c58a3d305dd5e1c9055772 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 15 Jan 2011 01:04:16 +0000
Subject: [PATCH] * ruby.c (process_options): autoload rubygems.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30549 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog      | 4 +++-
 gem_prelude.rb | 1 -
 ruby.c         | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 03c45607b1..d67d742ff5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
-Sat Jan 15 10:00:07 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Jan 15 10:04:14 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (process_options): autoload rubygems.
 
 	* tool/compile_prelude.rb (Prelude#initialize): ignore empty
 	  preludes.
diff --git a/gem_prelude.rb b/gem_prelude.rb
index 3d4516f341..e69de29bb2 100644
--- a/gem_prelude.rb
+++ b/gem_prelude.rb
@@ -1 +0,0 @@
-require 'rubygems.rb' if defined?(Gem)
diff --git a/ruby.c b/ruby.c
index 61a293e57e..b4d0bddf07 100644
--- a/ruby.c
+++ b/ruby.c
@@ -1365,7 +1365,7 @@ process_options(int argc, char **argv, struct cmdline_options *opt)
 	}
     }
     if (!(opt->disable & DISABLE_BIT(gems))) {
-	rb_define_module("Gem");
+	rb_autoload(rb_cObject, rb_intern("Gem"), "rubygems");
     }
     ruby_init_prelude();
     ruby_set_argv(argc, argv);