summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-07-03 15:29:01 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-07-03 15:29:01 +0000
commitc56e087895e60899ea9a8f588c5dfcf209e24439 (patch)
treeb36418d916dd7350e3f63bd8a1c4adcfa9cba8a6 /ext
parent1da517be7454c34888026f2dd9f6b07d63953e25 (diff)
* 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
Diffstat (limited to 'ext')
-rw-r--r--ext/tk/extconf.rb2
1 files changed, 1 insertions, 1 deletions
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 =~ / /}