nagai	2009-08-09 21:24:55 +0900 (Sun, 09 Aug 2009)

  New Revision: 24484

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

  Log:
    * ext/tk/extconf.rb (search_tclConfig): last change isn't enough. fixed it.

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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 24483)
+++ ChangeLog	(revision 24484)
@@ -1,3 +1,8 @@
+Sun Aug  9 21:14:03 2009  Hidetoshi NAGAI  <nagai@a...>
+
+	* ext/tk/extconf.rb (search_tclConfig): last change isn't enough.
+	  fixed it.
+
 Sun Aug  9 16:36:51 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* common.mk (ruby.imp): excluded prelude.o to get rid of circular
Index: ext/tk/tcltklib.c
===================================================================
--- ext/tk/tcltklib.c	(revision 24483)
+++ ext/tk/tcltklib.c	(revision 24484)
@@ -4,7 +4,7 @@
  *              Oct. 24, 1997   Y. Matsumoto
  */
 
-#define TCLTKLIB_RELEASE_DATE "2009-08-04"
+#define TCLTKLIB_RELEASE_DATE "2009-08-09"
 
 #include "ruby.h"
 
@@ -10544,9 +10544,11 @@
 
     /* --------------------------------------------------------------- */
 
+#ifdef HAVE_NATIVETHREAD
     /* if ruby->nativethread-supprt and tcltklib->doen't, 
        the following will cause link-error. */
     ruby_native_thread_p();
+#endif
 
     /* --------------------------------------------------------------- */
 
Index: ext/tk/extconf.rb
===================================================================
--- ext/tk/extconf.rb	(revision 24483)
+++ ext/tk/extconf.rb	(revision 24484)
@@ -1,6 +1,6 @@
 ##############################################################
 # extconf.rb for tcltklib
-# release date: 2009-08-07
+# release date: 2009-08-09
 ##############################################################
 require 'mkmf'
 
@@ -530,9 +530,6 @@
       tkconf = parse_tclConfig(tkpath)
       next if tkver && tkver !~ /^#{tkconf['TK_MAJOR_VERSION']}(\.?)#{tkconf['TK_MINOR_VERSION']}/
 
-      # find tclConfig.sh & tkConfig.sh
-      conf = [tclconf, tkconf] unless conf
-
       # nativethread check
       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."
@@ -540,6 +537,9 @@
         next
       end
 
+      # find tclConfig.sh & tkConfig.sh
+      conf = [tclconf, tkconf] unless conf
+
       # check Tcl library
       if TkLib_Config["tcltk-stubs"]
         stub = "stub"

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