diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ext/tk/extconf.rb | 5 |
2 files changed, 6 insertions, 3 deletions
@@ -1,3 +1,7 @@ +Fri Aug 7 01:04:17 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> + + * ext/tk/extconf.rb (search_tclConfig): fix logic bug. + Thu Aug 6 21:18:15 2009 NAKAMURA Usaku <usa@ruby-lang.org> * ext/digest/sha2/lib/sha2.eb: should require sha2.so. 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 |