yugui	2011-07-04 00:29:01 +0900 (Mon, 04 Jul 2011)

  New Revision: 32390

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=32390

  Log:
    * ext/tk/extconf.rb (find_tcl): fixed a TypeError on --with-opt-dir.
      reported by luislavena and ksmakoto.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/ext/tk/extconf.rb
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 32389)
+++ ruby_1_9_2/ChangeLog	(revision 32390)
@@ -1,3 +1,8 @@
+Mon Jul  4 00:28:05 2011  Yuki Sonoda (Yugui)  <yugui@y...>
+
+	* ext/tk/extconf.rb (find_tcl): fixed a TypeError on --with-opt-dir.
+	  reported by luislavena and ksmakoto.
+
 Sun Jul  3 22:40:37 2011  Yuki Sonoda (Yugui)  <yugui@y...>
 
 	* ext/zlib/zlib.c: added a prototype to get rid of SEGV on x86_64
Index: ruby_1_9_2/ext/tk/extconf.rb
===================================================================
--- ruby_1_9_2/ext/tk/extconf.rb	(revision 32389)
+++ ruby_1_9_2/ext/tk/extconf.rb	(revision 32390)
@@ -993,7 +993,7 @@
     default_paths |= ENV['PATH'].split(';').find_all{|dir| File.directory? dir}.map{|dir| File.expand_path(dir)} if ENV['PATH']
   end
 
-  default_paths |= TkLib_Config["checked_shlib_dirs"]
+  default_paths |= (TkLib_Config["checked_shlib_dirs"] || [])
 
   unless TkLib_Config["space-on-tk-libpath"]
     default_paths.delete_if{|path| path =~ / /}
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 32389)
+++ ruby_1_9_2/version.h	(revision 32390)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 288
+#define RUBY_PATCHLEVEL 289
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/