merges r23813 and r23821 from trunk into ruby_1_9_1.

--
* ruby.c (process_options), enc/prelude.rb: encdb and transdb are
  extension libraries.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@23841 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 9 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 2602f6b18..0fc5fc0b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Jun 22 14:41:47 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (process_options), enc/prelude.rb: encdb and transdb are
+	  extension libraries.
+
+	* ruby.c (process_options): set progname earlier.
+
 Sun Jun 21 22:33:05 2009  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* load.c (Init_load): $: must be readonly.  [ruby-dev:38690]
diff --git a/enc/prelude.rb b/enc/prelude.rb
index a5c78b7e6..8ce59f957 100644
--- a/enc/prelude.rb
+++ b/enc/prelude.rb
@@ -1,4 +1,4 @@
-%w'enc/encdb enc/trans/transdb'.each do |init|
+%w'enc/encdb.so enc/trans/transdb.so'.each do |init|
   begin
     require(init)
   rescue LoadError
diff --git a/ruby.c b/ruby.c
index c6cfdf7e1..61bf54f78 100644
--- a/ruby.c
+++ b/ruby.c
@@ -1274,7 +1274,7 @@ process_options(VALUE arg)
     rb_obj_freeze(opt->script_name);
 
     ruby_init_loadpath_safe(opt->safe_level);
-    rb_enc_find_index("encdb");
+    rb_enc_find_index("encdb.so");
     lenc = rb_locale_encoding();
     rb_enc_associate(rb_progname, lenc);
     parser = rb_parser_new();