yugui	2010-08-09 00:01:15 +0900 (Mon, 09 Aug 2010)

  New Revision: 28925

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28925

  Log:
    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].

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/ext/tk/extconf.rb

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 28924)
+++ ruby_1_9_2/ChangeLog	(revision 28925)
@@ -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 Aug  5 18:36:11 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* complex.c (nucomp_marshal_load): should check the argument.
Index: ruby_1_9_2/ext/tk/extconf.rb
===================================================================
--- ruby_1_9_2/ext/tk/extconf.rb	(revision 28924)
+++ ruby_1_9_2/ext/tk/extconf.rb	(revision 28925)
@@ -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/