nagai	2010-03-13 10:07:08 +0900 (Sat, 13 Mar 2010)

  New Revision: 26899

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

  Log:
    * 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.

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/ext/tk/extconf.rb
    branches/ruby_1_8/ext/tk/lib/tk.rb
    branches/ruby_1_8/ext/tk/tkutil/tkutil.c

Index: ruby_1_8/ext/tk/lib/tk.rb
===================================================================
--- ruby_1_8/ext/tk/lib/tk.rb	(revision 26898)
+++ ruby_1_8/ext/tk/lib/tk.rb	(revision 26899)
@@ -5663,7 +5663,7 @@
 #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'
Index: ruby_1_8/ext/tk/extconf.rb
===================================================================
--- ruby_1_8/ext/tk/extconf.rb	(revision 26898)
+++ ruby_1_8/ext/tk/extconf.rb	(revision 26899)
@@ -634,7 +634,8 @@
   TkLib_Config["tclConfig-dir"] = tclConfig_dir
   TkLib_Config["tkConfig-dir"] = tkConfig_dir
 
-  print("Search tclConfig.sh and tkConfig.sh.")
+  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 @@
 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 @@
 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.")
@@ -1273,7 +1283,7 @@
   print(".") # progress
   have_library("dl", "dlopen")
   print(".") # progress
-  have_library("m", "log")
+  have_library("m", "log", "math.h")
   print("\n") # progress
 end
 $CPPFLAGS += ' -D_WIN32' if /cygwin/ =~ RUBY_PLATFORM
Index: ruby_1_8/ext/tk/tkutil/tkutil.c
===================================================================
--- ruby_1_8/ext/tk/tkutil/tkutil.c	(revision 26898)
+++ ruby_1_8/ext/tk/tkutil/tkutil.c	(revision 26899)
@@ -7,7 +7,7 @@
 
 ************************************************/
 
-#define TKUTIL_RELEASE_DATE "2009-10-27"
+#define TKUTIL_RELEASE_DATE "2010-02-01"
 
 #include "ruby.h"
 
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 26898)
+++ ruby_1_8/ChangeLog	(revision 26899)
@@ -1,3 +1,7 @@
+Sat Mar 13 10:03:52 2010  Hidetoshi NAGAI  <nagai@a...>
+
+	* ext/tk/extconf.rb: fix [Bug #2840] Tk doesn't built in mingw.
+
 Wed Mar 10 16:12:21 2010  Akinori MUSHA  <knu@i...>
 
 	* eval.c (rb_f_loop): Return an enumerator if no block is given.

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