ruby-changes:16798
From: nagai <ko1@a...>
Date: Fri, 30 Jul 2010 08:06:46 +0900 (JST)
Subject: [ruby-changes:16798] Ruby:r28793 (trunk): * ext/tk/extconf.rb: use TK_XINCLUDES on tkConfig.sh when not empty,
nagai 2010-07-30 07:54:01 +0900 (Fri, 30 Jul 2010) New Revision: 28793 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28793 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: trunk/ChangeLog trunk/ext/tk/extconf.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 28792) +++ ChangeLog (revision 28793) @@ -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]. + Thu Jul 29 22:28:35 2010 Tanaka Akira <akr@f...> * ext/pathname/pathname.c (path_cmp): Pathname#<=> translated Index: ext/tk/extconf.rb =================================================================== --- ext/tk/extconf.rb (revision 28792) +++ ext/tk/extconf.rb (revision 28793) @@ -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 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/