1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ext/tk/extconf.rb: use TK_XINCLUDES on tkConfig.sh when not empty,

Browse Source 
even if MacOS X Aqua version [ruby-dev:41883].


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28793 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagai 2010-07-29 22:54:01 +00:00
parent 91c8bbdff7
commit bc8e650735
2 changed files with 10 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 @@
Fri Jul 30 07:48:04 2010 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/extconf.rb: use TK_XINCLUDES on tkConfig.sh when not empty,
even if MacOS X Aqua version [ruby-dev:41883].
Thu Jul 29 22:28:35 2010 Tanaka Akira <akr@fsij.org> Thu Jul 29 22:28:35 2010 Tanaka Akira <akr@fsij.org>
* ext/pathname/pathname.c (path_cmp): Pathname#<=> translated * ext/pathname/pathname.c (path_cmp): Pathname#<=> translated

10
ext/tk/extconf.rb
View File

@ -1,6 +1,6 @@
############################################################## ##############################################################
# extconf.rb for tcltklib # extconf.rb for tcltklib
# release date: 2010-05-31 # release date: 2010-07-30
############################################################## ##############################################################
require 'mkmf' require 'mkmf'
@ -1224,11 +1224,11 @@ def search_X_libraries
puts("Can't find X11 libraries. So, can't make tcltklib.so which is required by Ruby/Tk.") puts("Can't find X11 libraries. So, can't make tcltklib.so which is required by Ruby/Tk.")
exit exit
end end
end
if TkConfig_Info['TK_XINCLUDES'] && if TkConfig_Info['TK_XINCLUDES'] &&
!TkConfig_Info['TK_XINCLUDES'].strip.empty? !TkConfig_Info['TK_XINCLUDES'].strip.empty?
$INCFLAGS << " " << TkConfig_Info['TK_XINCLUDES'].strip $INCFLAGS << " " << TkConfig_Info['TK_XINCLUDES'].strip
end
end end
use_X use_X