From 833b354578f20162aa28fe8fe5cda38caa13b48f Mon Sep 17 00:00:00 2001 From: nagai Date: Thu, 6 Aug 2009 16:07:11 +0000 Subject: * 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 --- ext/tk/extconf.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'ext') 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 -- cgit v1.2.3