summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authornagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-07-29 22:53:52 +0000
committernagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-07-29 22:53:52 +0000
commita905ace6b4da82e4258714e27c1edd35506221a3 (patch)
treed8e0d528a93614eec743468bbae6d910fb138445 /ext
parent98aa864a248720c1427417dd3686d9585b7788fa (diff)
* 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_8@28792 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r--ext/tk/extconf.rb10
1 files changed, 5 insertions, 5 deletions
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