diff options
| author | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-19 14:45:31 +0000 |
|---|---|---|
| committer | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-19 14:45:31 +0000 |
| commit | 6e23ac0cfdc55f5a6706116fac3a99fae9a21f74 (patch) | |
| tree | 0bc68a03f497204e2a71dc1224e878279cbcc7d0 | |
| parent | eaed6d188030176d3064d00e8624c9d900818396 (diff) | |
* 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/branches/ruby_1_8@27905 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 <[email protected]> + + * ext/tk/extconf.rb: [ruby-def:41334] [Bug #3307] invalid result + on searching tcl.h/tk.h. Thanks, Masaya Tarui. + Mon May 17 06:19:45 2010 Nobuyoshi Nakada <[email protected]> * common.mk (revision.h.tmp): use double quotes for Windows. 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 |