From 979ac967a9d0437e698d3e555098c77e495baee8 Mon Sep 17 00:00:00 2001
From: nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 9 Aug 2009 12:24:55 +0000
Subject: [PATCH] * ext/tk/extconf.rb (search_tclConfig): last change isn't
 enough. fixed it.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24484 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog         | 5 +++++
 ext/tk/extconf.rb | 8 ++++----
 ext/tk/tcltklib.c | 4 +++-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7a1a9f6428..08bb6ca048 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Aug  9 21:14:03 2009  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/extconf.rb (search_tclConfig): last change isn't enough.
+	  fixed it.
+
 Sun Aug  9 16:36:51 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* common.mk (ruby.imp): excluded prelude.o to get rid of circular
diff --git a/ext/tk/extconf.rb b/ext/tk/extconf.rb
index baf19b2c5a..e3deebda05 100644
--- a/ext/tk/extconf.rb
+++ b/ext/tk/extconf.rb
@@ -1,6 +1,6 @@
 ##############################################################
 # extconf.rb for tcltklib
-# release date: 2009-08-07
+# release date: 2009-08-09
 ##############################################################
 require 'mkmf'
 
@@ -530,9 +530,6 @@ def search_tclConfig(*paths) # libdir list or [tcl-libdir|file, tk-libdir|file]
       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 @@ def search_tclConfig(*paths) # libdir list or [tcl-libdir|file, tk-libdir|file]
         next
       end
 
+      # find tclConfig.sh & tkConfig.sh
+      conf = [tclconf, tkconf] unless conf
+
       # check Tcl library
       if TkLib_Config["tcltk-stubs"]
         stub = "stub"
diff --git a/ext/tk/tcltklib.c b/ext/tk/tcltklib.c
index a926d3f5d0..2938536cda 100644
--- a/ext/tk/tcltklib.c
+++ b/ext/tk/tcltklib.c
@@ -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 @@ Init_tcltklib()
 
     /* --------------------------------------------------------------- */
 
+#ifdef HAVE_NATIVETHREAD
     /* if ruby->nativethread-supprt and tcltklib->doen't, 
        the following will cause link-error. */
     ruby_native_thread_p();
+#endif
 
     /* --------------------------------------------------------------- */