kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merges r27904,r27907 and r27909 from trunk into ruby_1_9_2.

Browse source 
--
* 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
This commit is contained in:
yugui 2010-05-23 12:18:26 +00:00
parent a8e4a2aa17
commit ff6b42e783
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Wed May 19 23:36:57 2010 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* 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@ruby-lang.org>
* lib/net/imap.rb (disconnect): closes the socket of a Net::IMAP

6
ext/tk/extconf.rb
View file

@ -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