From ff6b42e7830fe554ae74e2cb875e400e6cbfc3bb Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 23 May 2010 12:18:26 +0000 Subject: [PATCH] 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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@27972 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/tk/extconf.rb | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2c38a047a9..41c9e0f19f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed May 19 23:36:57 2010 Hidetoshi NAGAI + + * 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 * lib/net/imap.rb (disconnect): closes the socket of a Net::IMAP diff --git a/ext/tk/extconf.rb b/ext/tk/extconf.rb index 5b2878b30d..c5dbfeafa6 100644 --- a/ext/tk/extconf.rb +++ b/ext/tk/extconf.rb @@ -1,6 +1,6 @@ ############################################################## # extconf.rb for tcltklib -# release date: 2010-05-07 +# release date: 2010-05-19 ############################################################## require 'mkmf' @@ -989,7 +989,7 @@ def find_tcltk_header(tclver, tkver) 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 ', TclConfig_Info['TCL_INCLUDE_SPEC']) $INCFLAGS << " " << TclConfig_Info['TCL_INCLUDE_SPEC'] elsif have_tcl_h = have_header('tcl.h') # find @@ -1009,7 +1009,7 @@ def find_tcltk_header(tclver, tkver) 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 ', TkConfig_Info['TK_INCLUDE_SPEC']) $INCFLAGS << " " << TkConfig_Info['TK_INCLUDE_SPEC'] elsif have_tk_h = have_header('tk.h') # find