summaryrefslogtreecommitdiff
path: root/ext/tcltklib
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2000-09-22 18:15:52 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2000-09-22 18:15:52 +0000
commite4fae8da4beeb7b61a9c3b58d66a4e594f0e73fa (patch)
tree90792cf8ee88dfaff3722e990e900d422f8f875f /ext/tcltklib
parent77f8b0db8d6b95fde7ca8b7a9dcd0f42f0f97af5 (diff)
matz
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@964 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/tcltklib')
-rw-r--r--ext/tcltklib/extconf.rb16
1 files changed, 14 insertions, 2 deletions
diff --git a/ext/tcltklib/extconf.rb b/ext/tcltklib/extconf.rb
index 58f2708c791..c958755c6ef 100644
--- a/ext/tcltklib/extconf.rb
+++ b/ext/tcltklib/extconf.rb
@@ -18,10 +18,16 @@ tcllib = with_config("tcllib")
stubs = enable_config("tcltk_stubs") || with_config("tcltk_stubs")
def find_tcl(tcllib, stubs)
- paths = ["/usr/local/lib", "/usr/pkg"]
+ paths = ["/usr/local/lib", "/usr/pkg", "/usr/lib"]
func = stubs ? "Tcl_InitStubs" : "Tcl_FindExecutable"
if tcllib
find_library(tcllib, func, *paths)
+ elsif RUBY_PLATFORM =~ /mswin32|mingw|cygwin/
+ find_library("tcl", func, *paths) or
+ find_library("tcl83", func, *paths) or
+ find_library("tcl82", func, *paths) or
+ find_library("tcl80", func, *paths) or
+ find_library("tcl76", func, *paths)
else
find_library("tcl", func, *paths) or
find_library("tcl8.3", func, *paths) or
@@ -32,10 +38,16 @@ def find_tcl(tcllib, stubs)
end
def find_tk(tklib, stubs)
- paths = ["/usr/local/lib", "/usr/pkg"]
+ paths = ["/usr/local/lib", "/usr/pkg", "/usr/lib"]
func = stubs ? "Tk_InitStubs" : "Tk_Init"
if tklib
find_library(tklib, func, *paths)
+ elsif RUBY_PLATFORM =~ /mswin32|mingw|cygwin/
+ find_library("tk", func, *paths) or
+ find_library("tk83", func, *paths) or
+ find_library("tk82", func, *paths) or
+ find_library("tk80", func, *paths) or
+ find_library("tk42", func, *paths)
else
find_library("tk", func, *paths) or
find_library("tk8.3", func, *paths) or