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

* ext/tk/extconf.rb (search_tclConfig): last change isn't enough. fixed it.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24484 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagai 2009-08-09 12:24:55 +00:00
parent 83c5dfb7ea
commit 979ac967a9
3 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sun Aug 9 21:14:03 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/extconf.rb (search_tclConfig): last change isn't enough.
fixed it.
Sun Aug 9 16:36:51 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Sun Aug 9 16:36:51 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (ruby.imp): excluded prelude.o to get rid of circular * common.mk (ruby.imp): excluded prelude.o to get rid of circular

8
ext/tk/extconf.rb
View file

@ -1,6 +1,6 @@
############################################################## ##############################################################
# extconf.rb for tcltklib # extconf.rb for tcltklib
# release date: 2009-08-07 # release date: 2009-08-09
############################################################## ##############################################################
require 'mkmf' require 'mkmf'
@ -530,9 +530,6 @@ def search_tclConfig(*paths) # libdir list or [tcl-libdir|file, tk-libdir|file]
tkconf = parse_tclConfig(tkpath) tkconf = parse_tclConfig(tkpath)
next if tkver && tkver !~ /^#{tkconf['TK_MAJOR_VERSION']}(\.?)#{tkconf['TK_MINOR_VERSION']}/ next if tkver && tkver !~ /^#{tkconf['TK_MAJOR_VERSION']}(\.?)#{tkconf['TK_MINOR_VERSION']}/
# find tclConfig.sh & tkConfig.sh
conf = [tclconf, tkconf] unless conf
# nativethread check # nativethread check
if !TkLib_Config["ruby_with_thread"] && tclconf['TCL_THREADS'] == '1' if !TkLib_Config["ruby_with_thread"] && tclconf['TCL_THREADS'] == '1'
puts "WARNIG: find #{tclpath.inspect}, but it WITH nativethread-support under ruby WITHOUT nativethread-support. So, ignore it." puts "WARNIG: find #{tclpath.inspect}, but it WITH nativethread-support under ruby WITHOUT nativethread-support. So, ignore it."
@ -540,6 +537,9 @@ def search_tclConfig(*paths) # libdir list or [tcl-libdir|file, tk-libdir|file]
next next
end end
# find tclConfig.sh & tkConfig.sh
conf = [tclconf, tkconf] unless conf
# check Tcl library # check Tcl library
if TkLib_Config["tcltk-stubs"] if TkLib_Config["tcltk-stubs"]
stub = "stub" stub = "stub"

4
ext/tk/tcltklib.c
View file

@ -4,7 +4,7 @@
* Oct. 24, 1997 Y. Matsumoto * Oct. 24, 1997 Y. Matsumoto
*/ */
#define TCLTKLIB_RELEASE_DATE "2009-08-04" #define TCLTKLIB_RELEASE_DATE "2009-08-09"
#include "ruby.h" #include "ruby.h"
@ -10544,9 +10544,11 @@ Init_tcltklib()
/* --------------------------------------------------------------- */ /* --------------------------------------------------------------- */
#ifdef HAVE_NATIVETHREAD
/* if ruby->nativethread-supprt and tcltklib->doen't, /* if ruby->nativethread-supprt and tcltklib->doen't,
the following will cause link-error. */ the following will cause link-error. */
ruby_native_thread_p(); ruby_native_thread_p();
#endif
/* --------------------------------------------------------------- */ /* --------------------------------------------------------------- */