diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-08-08 15:01:15 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-08-08 15:01:15 +0000 |
| commit | 9340172f65c06889a6adfcdc5b522e617f04807a (patch) | |
| tree | 4f802dc2dddbbf6a02c7def55c4fff46a02b0e59 | |
| parent | d1fa0a3482fbcad3ad7fe91b24e31a4a5ad0bd2e (diff) | |
merges r28793 from trunk into ruby_1_9_2.
--
* ext/tk/extconf.rb: use TK_XINCLUDES on tkConfig.sh when not empty,
even if MacOS X Aqua version [ruby-dev:41883].
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28925 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/tk/extconf.rb | 10 |
2 files changed, 10 insertions, 5 deletions
@@ -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 Aug 5 18:36:11 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> * complex.c (nucomp_marshal_load): should check the argument. diff --git a/ext/tk/extconf.rb b/ext/tk/extconf.rb index 3f46562f37..388d6fc1aa 100644 --- a/ext/tk/extconf.rb +++ b/ext/tk/extconf.rb @@ -1,6 +1,6 @@ ############################################################## # extconf.rb for tcltklib -# release date: 2010-05-31 +# release date: 2010-07-30 ############################################################## 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.") exit end + end - if TkConfig_Info['TK_XINCLUDES'] && - !TkConfig_Info['TK_XINCLUDES'].strip.empty? - $INCFLAGS << " " << TkConfig_Info['TK_XINCLUDES'].strip - end + if TkConfig_Info['TK_XINCLUDES'] && + !TkConfig_Info['TK_XINCLUDES'].strip.empty? + $INCFLAGS << " " << TkConfig_Info['TK_XINCLUDES'].strip end use_X |