summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-07-14 21:31:13 +0000
committernagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-07-14 21:31:13 +0000
commit9dd9217f70d7b33faec1e79ef5bb7b2f409a4d5f (patch)
tree4fffa15e1f8ed59ecc81017ab8332cf26fb49896
parentbd3923d599e69ead867029c2e83c9e8043e13524 (diff)
* ext/tk/extconf.rb: --with-{tcl,tk}-dir doesn't work.[ruby-dev:38782]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@24112 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--ext/tk/extconf.rb4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index fc412346b1..4bf0a2656f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jul 15 06:21:50 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/extconf.rb: --with-{tcl,tk}-dir doesn't work.[ruby-dev:38782]
+
Tue Jul 14 09:26:14 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/multi-tk.rb: Long-term-callback support isn't stable yet.
diff --git a/ext/tk/extconf.rb b/ext/tk/extconf.rb
index 7d2853a37b..193e41b2dc 100644
--- a/ext/tk/extconf.rb
+++ b/ext/tk/extconf.rb
@@ -1173,8 +1173,8 @@ if TkLib_Config["tcltk-framework"]
end
# search Tcl/Tk libraries
-tk_idir, tk_ldir = dir_config("tk") if with_config('tk')
-tcl_idir, tcl_ldir = dir_config("tcl") if with_config('tcl')
+tk_idir, tk_ldir = dir_config("tk")
+tcl_idir, tcl_ldir = dir_config("tcl")
tk_ldir2 = with_config("tk-lib")
tcl_ldir2 = with_config("tcl-lib")