diff options
| author | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-06 16:07:11 +0000 |
|---|---|---|
| committer | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-06 16:07:11 +0000 |
| commit | 5d43c465e19a565f23b82f04384af8e98ea9308f (patch) | |
| tree | 73368f86c18f0cb3f7cb5b62a3d99e11d99d3002 /ext | |
| parent | 28ed738bd5bb427c8e0076ded8237d2334325b46 (diff) | |
| download | ruby-5d43c465e19a565f23b82f04384af8e98ea9308f.tar.gz ruby-5d43c465e19a565f23b82f04384af8e98ea9308f.tar.xz ruby-5d43c465e19a565f23b82f04384af8e98ea9308f.zip | |
* ext/tk/extconf.rb (search_tclConfig): fix logic bug.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@24431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/tk/extconf.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ext/tk/extconf.rb b/ext/tk/extconf.rb index 7872acc4d..baf19b2c5 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 |