From bc8e65073588035b6d6d272be8c697a8dc27ee81 Mon Sep 17 00:00:00 2001
From: nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 29 Jul 2010 22:54:01 +0000
Subject: [PATCH] * 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/trunk@28793 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog         |  5 +++++
 ext/tk/extconf.rb | 10 +++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9c7eeb1c84..5f7338ddc6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
 	* ext/pathname/pathname.c (path_cmp): Pathname#<=> translated
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