diff options
Diffstat (limited to 'ext/tcltklib')
| -rw-r--r-- | ext/tcltklib/extconf.rb | 8 | ||||
| -rw-r--r-- | ext/tcltklib/tcltklib.c | 10 |
2 files changed, 14 insertions, 4 deletions
diff --git a/ext/tcltklib/extconf.rb b/ext/tcltklib/extconf.rb index 8ec34f0214..0635eea9e0 100644 --- a/ext/tcltklib/extconf.rb +++ b/ext/tcltklib/extconf.rb @@ -41,7 +41,9 @@ def find_tcl(tcllib, stubs) true else %w[8.5 8.4 8.3 8.2 8.1 8.0 7.6].find { |ver| - find_library("tcl#{ver}", func, *paths) or + find_library("#{lib}#{ver}", func, *paths) or + find_library("#{lib}#{ver.delete('.')}", func, *paths) or + find_library("tcl#{ver}", func, *paths) or find_library("tcl#{ver.delete('.')}", func, *paths) } end @@ -62,7 +64,9 @@ def find_tk(tklib, stubs) true else %w[8.5 8.4 8.3 8.2 8.1 8.0 4.2].find { |ver| - find_library("tk#{ver}", func, *paths) or + find_library("#{lib}#{ver}", func, *paths) or + find_library("#{lib}#{ver.delete('.')}", func, *paths) or + find_library("tk#{ver}", func, *paths) or find_library("tk#{ver.delete('.')}", func, *paths) } end diff --git a/ext/tcltklib/tcltklib.c b/ext/tcltklib/tcltklib.c index 67958d7beb..a80b4530f1 100644 --- a/ext/tcltklib/tcltklib.c +++ b/ext/tcltklib/tcltklib.c @@ -3461,8 +3461,14 @@ ip_init(argc, argv, self) case 1: /* argv0 */ if (!NIL_P(argv0)) { - /* Tcl_SetVar(ptr->ip, "argv0", StringValuePtr(argv0), 0); */ - Tcl_SetVar(ptr->ip, "argv0", StringValuePtr(argv0), TCL_GLOBAL_ONLY); + if (strncmp(StringValuePtr(argv0), "-e", 3) == 0 + || strncmp(StringValuePtr(argv0), "-", 2) == 0) { + Tcl_SetVar(ptr->ip, "argv0", "ruby", TCL_GLOBAL_ONLY); + } else { + /* Tcl_SetVar(ptr->ip, "argv0", StringValuePtr(argv0), 0); */ + Tcl_SetVar(ptr->ip, "argv0", StringValuePtr(argv0), + TCL_GLOBAL_ONLY); + } } case 0: /* no args */ |