diff options
author | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-19 14:45:03 +0000 |
---|---|---|
committer | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-19 14:45:03 +0000 |
commit | 3c80aa56de08e2b722ee62ace2a27371d32af4a7 (patch) | |
tree | d173c3cb82b2d8445347f0847ac4fe3495978cf9 | |
parent | f1ff36a331d41f1fb7712cae20cbad274ef30dea (diff) | |
download | ruby-3c80aa56de08e2b722ee62ace2a27371d32af4a7.tar.gz |
* ext/tk/extconf.rb: [ruby-def:41334] [Bug #3307] invalid result on searching tcl.h/tk.h. Thanks, Masaya Tarui.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27904 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ext/tk/extconf.rb | 6 |
2 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Wed May 19 23:36:57 2010 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> + + * ext/tk/extconf.rb: invalid result on searching tcl.h/tk.h. + [ruby-def:41334] [Bug #3307]. Thanks, Masaya Tarui. + Wed May 19 23:19:30 2010 Shugo Maeda <shugo@ruby-lang.org> * 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 <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 @@ 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 <tk.h>', TkConfig_Info['TK_INCLUDE_SPEC']) $INCFLAGS << " " << TkConfig_Info['TK_INCLUDE_SPEC'] elsif have_tk_h = have_header('tk.h') # find |