From 238245bc8e27895678679d0a7dae46e063e81dcf Mon Sep 17 00:00:00 2001 From: matz Date: Fri, 22 Sep 2000 18:15:52 +0000 Subject: matz git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@964 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/tcltklib/extconf.rb | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'ext/tcltklib') diff --git a/ext/tcltklib/extconf.rb b/ext/tcltklib/extconf.rb index 58f2708c7..c958755c6 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 -- cgit