summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authornagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-08-06 16:07:11 +0000
committernagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-08-06 16:07:11 +0000
commit833b354578f20162aa28fe8fe5cda38caa13b48f (patch)
tree73368f86c18f0cb3f7cb5b62a3d99e11d99d3002 /ext
parente97f1270b5332a5705f4999402fa97dc005097a2 (diff)
* ext/tk/extconf.rb (search_tclConfig): fix logic bug.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r--ext/tk/extconf.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/ext/tk/extconf.rb b/ext/tk/extconf.rb
index 7872acc4d9..baf19b2c5a 100644
--- a/ext/tk/extconf.rb
+++ b/ext/tk/extconf.rb
@@ -1,6 +1,6 @@
##############################################################
# extconf.rb for tcltklib
-# release date: 2009-07-28
+# release date: 2009-08-07
##############################################################
require 'mkmf'
@@ -534,8 +534,7 @@ def search_tclConfig(*paths) # libdir list or [tcl-libdir|file, tk-libdir|file]
conf = [tclconf, tkconf] unless conf
# nativethread check
- unless TkLib_Config["ruby_with_thread"]
- tclconf['TCL_THREADS'] == '1'
+ if !TkLib_Config["ruby_with_thread"] && tclconf['TCL_THREADS'] == '1'
puts "WARNIG: find #{tclpath.inspect}, but it WITH nativethread-support under ruby WITHOUT nativethread-support. So, ignore it."
TkLib_Config["tcltk-NG-path"] << File.dirname(tclpath)
next