yugui	2010-05-23 21:18:26 +0900 (Sun, 23 May 2010)

  New Revision: 27972

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

  Log:
    merges r27904,r27907 and r27909 from trunk into ruby_1_9_2.
    --
    * ext/tk/extconf.rb: [ruby-def:41334] [Bug #3307] invalid result on searching tcl.h/tk.h. Thanks, Masaya Tarui.
    --
    * ChangeLog: commit miss. sorry.
    --
    * ChangeLog: sorry. fix typo.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/ext/tk/extconf.rb

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 27971)
+++ ruby_1_9_2/ChangeLog	(revision 27972)
@@ -1,3 +1,8 @@
+Wed May 19 23:36:57 2010  Hidetoshi NAGAI  <nagai@a...>
+
+	* ext/tk/extconf.rb: [ruby-dev:41334] [Bug #3307] invalid result
+	  on searching tcl.h/tk.h. Thanks, Masaya Tarui.
+
 Wed May 19 23:19:30 2010  Shugo Maeda  <shugo@r...>
 
 	* lib/net/imap.rb (disconnect): closes the socket of a Net::IMAP
Index: ruby_1_9_2/ext/tk/extconf.rb
===================================================================
--- ruby_1_9_2/ext/tk/extconf.rb	(revision 27971)
+++ ruby_1_9_2/ext/tk/extconf.rb	(revision 27972)
@@ -1,6 +1,6 @@
 ##############################################################
 # extconf.rb for tcltklib
-# release date: 2010-05-07
+# release date: 2010-05-19
 ##############################################################
 require 'mkmf'
 
@@ -989,7 +989,7 @@
   end
 
   if TclConfig_Info['TCL_INCLUDE_SPEC'] && 
-      have_tcl_h = try_cpp('tcl.h', TclConfig_Info['TCL_INCLUDE_SPEC'])
+      have_tcl_h = try_cpp('#include <tcl.h>', TclConfig_Info['TCL_INCLUDE_SPEC'])
     $INCFLAGS << " " << TclConfig_Info['TCL_INCLUDE_SPEC']
   elsif have_tcl_h = have_header('tcl.h')
     # find
@@ -1009,7 +1009,7 @@
   end
 
   if TkConfig_Info['TK_INCLUDE_SPEC'] && 
-      have_tk_h = try_cpp('tk.h', TkConfig_Info['TK_INCLUDE_SPEC'])
+      have_tk_h = try_cpp('#include <tk.h>', TkConfig_Info['TK_INCLUDE_SPEC'])
     $INCFLAGS << " " << TkConfig_Info['TK_INCLUDE_SPEC']
   elsif have_tk_h = have_header('tk.h')
     # find

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