diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-08-20 21:42:21 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-08-20 21:42:21 +0000 |
| commit | 7e28ad63fff06ab146debe63df0645ce2b451ea0 (patch) | |
| tree | 2545b99d5005083f2d9362a63eb296856b088c7f /ext | |
| parent | 34fff376ffbbf8e1fcff501869f043003f88edd5 (diff) | |
* ext/tcltklib/extconf.rb (find_tcl, find_tk): find stub library.
* lib/mkmf.rb (arg_config, with_config): deal with '-' and '_'
uniformly. [ruby-dev:24118]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6802 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/tcltklib/extconf.rb | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/ext/tcltklib/extconf.rb b/ext/tcltklib/extconf.rb index ac48812d7a..f17354fcaf 100644 --- a/ext/tcltklib/extconf.rb +++ b/ext/tcltklib/extconf.rb @@ -28,10 +28,16 @@ stubs = enable_config("tcltk_stubs") || with_config("tcltk_stubs") def find_tcl(tcllib, stubs) paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"] - func = stubs ? "Tcl_InitStubs" : "Tcl_FindExecutable" + if stubs + func = "Tcl_InitStubs" + lib = "tclstub" + else + func = "Tcl_FindExecutable" + lib = "tcl" + end if tcllib find_library(tcllib, func, *paths) - elsif find_library("tcl", func, *paths) + elsif find_library(lib, func, *paths) true else %w[8.5 8.4 8.3 8.2 8.1 8.0 7.6].find { |ver| @@ -43,10 +49,16 @@ end def find_tk(tklib, stubs) paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"] - func = stubs ? "Tk_InitStubs" : "Tk_Init" + if stubs + func = "Tk_InitStubs" + lib = "tkstub" + else + func = "Tk_Init" + lib = "tk" + end if tklib find_library(tklib, func, *paths) - elsif find_library("tk", func, *paths) + elsif find_library(lib, func, *paths) true else %w[8.5 8.4 8.3 8.2 8.1 8.0 4.2].find { |ver| @@ -230,5 +242,5 @@ if mac_need_framework || $LDFLAGS += ' -framework Tk -framework Tcl' end - create_makefile("tcltklib") if pthread_check + create_makefile("tcltklib") if stubs or pthread_check end |