* ext/tk/extconf.rb (find_tcl): fixed a TypeError on --with-opt-dir.

  reported by luislavena and ksmakoto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@32390 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 76cf5b1143..82566169f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jul  4 00:28:05 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* 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@yugui.jp>
 
 	* ext/zlib/zlib.c: added a prototype to get rid of SEGV on x86_64
diff --git a/ext/tk/extconf.rb b/ext/tk/extconf.rb
index 6b59c20029..230b224cff 100644
--- a/ext/tk/extconf.rb
+++ b/ext/tk/extconf.rb
@@ -993,7 +993,7 @@ def find_tcl(tcllib, stubs, version, *opt_paths)
     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 =~ / /}
diff --git a/version.h b/version.h
index 5e16a228fd..854a249c73 100644
--- a/version.h
+++ b/version.h
@@ -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