diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-23 12:18:26 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-23 12:18:26 +0000 |
| commit | ff6b42e7830fe554ae74e2cb875e400e6cbfc3bb (patch) | |
| tree | 390f3eb040733e0e4236f216cc869185a851aaf0 /ext | |
| parent | a8e4a2aa175b0650c0793c2fa64d574b5e8f188e (diff) | |
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
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/tk/extconf.rb | 6 |
1 files changed, 3 insertions, 3 deletions
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 |