[前][次][番号順一覧][スレッド一覧]

ruby-changes:12714

From: nagai <ko1@a...>
Date: Fri, 7 Aug 2009 01:07:28 +0900 (JST)
Subject: [ruby-changes:12714] Ruby:r24431 (trunk): * ext/tk/extconf.rb (search_tclConfig): fix logic bug.

nagai	2009-08-07 01:07:11 +0900 (Fri, 07 Aug 2009)

  New Revision: 24431

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=24431

  Log:
    * ext/tk/extconf.rb (search_tclConfig): fix logic bug.

  Modified files:
    trunk/ChangeLog
    trunk/ext/tk/extconf.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 24430)
+++ ChangeLog	(revision 24431)
@@ -1,3 +1,7 @@
+Fri Aug  7 01:04:17 2009  Hidetoshi NAGAI  <nagai@a...>
+
+	* ext/tk/extconf.rb (search_tclConfig): fix logic bug.
+
 Thu Aug  6 21:18:15 2009  NAKAMURA Usaku  <usa@r...>
 
 	* ext/digest/sha2/lib/sha2.eb: should require sha2.so.
Index: ext/tk/extconf.rb
===================================================================
--- ext/tk/extconf.rb	(revision 24430)
+++ ext/tk/extconf.rb	(revision 24431)
@@ -1,6 +1,6 @@
 ##############################################################
 # extconf.rb for tcltklib
-# release date: 2009-07-28
+# release date: 2009-08-07
 ##############################################################
 require 'mkmf'
 
@@ -534,8 +534,7 @@
       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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]