From fd684f1082e25f1752ba2bfcd7c3b3525261795b Mon Sep 17 00:00:00 2001
From: nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 13 Mar 2010 01:07:23 +0000
Subject: * ext/tk/extconf.rb: fix [Bug #2840] Tk doesn't built in mingw. *
 ext/tk/lib/tk.rb: forgot updating RELEASE_DATE at last commit. *
 ext/tk/tkutil/tkutil.c: ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26901 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog              |  4 ++++
 ext/tk/extconf.rb      | 14 ++++++++++++--
 ext/tk/lib/tk.rb       |  2 +-
 ext/tk/tkutil/tkutil.c |  2 +-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1072921895..e67e620f68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Mar 13 10:03:52 2010  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/extconf.rb: fix [Bug #2840] Tk doesn't built in mingw.
+
 Sat Mar 13 03:24:15 2010  Tanaka Akira  <akr@fsij.org>
 
 	* tool/transcode-tblgen.rb: show cosumed time at last.
diff --git a/ext/tk/extconf.rb b/ext/tk/extconf.rb
index 288c5e920a..067c51449e 100644
--- a/ext/tk/extconf.rb
+++ b/ext/tk/extconf.rb
@@ -634,7 +634,8 @@ def get_tclConfig(tclConfig_file, tkConfig_file, tclConfig_dir, tkConfig_dir)
   TkLib_Config["tclConfig-dir"] = tclConfig_dir
   TkLib_Config["tkConfig-dir"] = tkConfig_dir
 
-  print("Search tclConfig.sh and tkConfig.sh in #{tclConfig_dir}.")
+  print("Search tclConfig.sh", (tclConfig_dir)? " (in #{tclConfig_dir})": "", 
+        " and tkConfig.sh", (tkConfig_dir)? " (in #{tkConfig_dir})": "", ".")
   if tclConfig_dir
     tclConfig, tkConfig = 
       search_tclConfig([ ((tclConfig_file)? tclConfig_file: tclConfig_dir), 
@@ -727,7 +728,14 @@ def check_shlib_search_path(paths)
 end
 
 def search_vers_on_path(vers, path, *heads)
-  files = Dir.glob(File.join(path, "*{#{heads.join(',')}}*.{#{CONFIG['LIBEXT']},#{CONFIG['DLEXT']}}"))
+  if enable_config("shared") == false
+    exts = CONFIG['LIBEXT'] + ',' + CONFIG['DLEXT']
+  else
+    exts = CONFIG['DLEXT'] + ',' + CONFIG['LIBEXT']
+  end
+  exts << ",dll,lib" if is_win32?
+  exts << ",bundle,dylib" if is_macosx? || /nextstep|openstep|rhapsody/ =~ RUBY_PLATFORM
+  files = Dir.glob(File.join(path, "*{#{heads.join(',')}}*.{#{exts}}"))
   vers.find_all{|ver| files.find{|f| f =~ /(#{ver}|#{ver.delete('.')})/} }
 end
 
@@ -1256,6 +1264,8 @@ print(".") # progress
 have_func("rb_obj_taint", "ruby.h")
 print(".") # progress
 have_func("rb_set_safe_level_force", "ruby.h")
+print(".") # progress
+have_func("rb_sourcefile", "ruby.h")
 print("\n") # progress
 
 print("check struct members.")
diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb
index f17a6af4d2..594442c3b6 100644
--- a/ext/tk/lib/tk.rb
+++ b/ext/tk/lib/tk.rb
@@ -5663,7 +5663,7 @@ TkWidget = TkWindow
 #Tk.freeze
 
 module Tk
-  RELEASE_DATE = '2009-08-04'.freeze
+  RELEASE_DATE = '2010-02-01'.freeze
 
   autoload :AUTO_PATH,        'tk/variable'
   autoload :TCL_PACKAGE_PATH, 'tk/variable'
diff --git a/ext/tk/tkutil/tkutil.c b/ext/tk/tkutil/tkutil.c
index 76cb5345be..86539ac2e7 100644
--- a/ext/tk/tkutil/tkutil.c
+++ b/ext/tk/tkutil/tkutil.c
@@ -7,7 +7,7 @@
 
 ************************************************/
 
-#define TKUTIL_RELEASE_DATE "2009-10-27"
+#define TKUTIL_RELEASE_DATE "2010-02-01"
 
 #include "ruby.h"
 
-- 
cgit v1.2.3