summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-07-14 21:29:49 +0000
committernagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-07-14 21:29:49 +0000
commit67e29c54b68b110cfa783c99842b96219d8a0d67 (patch)
tree25b1f042d273795e97b34649023117ec6af5150e
parent2dab2f4a2840bb93ed071bf482cd9ea884150baf (diff)
downloadruby-67e29c54b68b110cfa783c99842b96219d8a0d67.tar.gz
ruby-67e29c54b68b110cfa783c99842b96219d8a0d67.tar.xz
ruby-67e29c54b68b110cfa783c99842b96219d8a0d67.zip
* ext/tk/extconf.rb: --with-{tcl,tk}-dir doesn't work.[ruby-dev:38782]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@24111 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 195ebb309..f905ac5a5 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]
+
Wed Jul 15 04:22:54 2009 NARUSE, Yui <naruse@ruby-lang.org>
* test/cgi/test_cgi_multipart.rb (CGIMultipartTest#_prepare):
diff --git a/ext/tk/extconf.rb b/ext/tk/extconf.rb
index 7d2853a37..193e41b2d 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")