ruby-changes:16797
From: nagai <ko1@a...>
Date: Fri, 30 Jul 2010 08:06:15 +0900 (JST)
Subject: [ruby-changes:16797] Ruby:r28792 (ruby_1_8): * ext/tk/extconf.rb: use TK_XINCLUDES on tkConfig.sh when not empty,
nagai 2010-07-30 07:53:52 +0900 (Fri, 30 Jul 2010) New Revision: 28792 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28792 Log: * ext/tk/extconf.rb: use TK_XINCLUDES on tkConfig.sh when not empty, even if MacOS X Aqua version [ruby-dev:41883]. Modified files: branches/ruby_1_8/ChangeLog branches/ruby_1_8/ext/tk/extconf.rb Index: ruby_1_8/ext/tk/extconf.rb =================================================================== --- ruby_1_8/ext/tk/extconf.rb (revision 28791) +++ ruby_1_8/ext/tk/extconf.rb (revision 28792) @@ -1,6 +1,6 @@ ############################################################## # extconf.rb for tcltklib -# release date: 2010-05-31 +# release date: 2010-07-30 ############################################################## require 'mkmf' @@ -1224,11 +1224,11 @@ 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 Index: ruby_1_8/ChangeLog =================================================================== --- ruby_1_8/ChangeLog (revision 28791) +++ ruby_1_8/ChangeLog (revision 28792) @@ -1,3 +1,8 @@ +Fri Jul 30 07:48:04 2010 Hidetoshi NAGAI <nagai@a...> + + * ext/tk/extconf.rb: use TK_XINCLUDES on tkConfig.sh when not empty, + even if MacOS X Aqua version [ruby-dev:41883]. + Fri Jul 30 07:47:21 2010 Nobuyoshi Nakada <nobu@r...> * instruby.rb (ext-arch): prune directories start with '-'. -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/