Index: kitsh/buildsrc/kitsh-0.0/aclocal.m4 ================================================================== --- kitsh/buildsrc/kitsh-0.0/aclocal.m4 +++ kitsh/buildsrc/kitsh-0.0/aclocal.m4 @@ -171,10 +171,13 @@ DC_DO_STATIC_LINK_LIBCXX fi if test "${proj}" = "tk"; then DC_DO_TK AC_DEFINE(KIT_INCLUDES_TK, [1], [Specify this if we link statically to Tk]) + if test -n "${TK_VERSION}"; then + AC_DEFINE_UNQUOTED(KIT_TK_VERSION, "${TK_VERSION}${TK_PATCH_LEVEL}", [Specify the version of Tk]) + fi if test "$host_os" = "mingw32msvc" -o "$host_os" = "mingw32"; then AC_DEFINE(KITSH_NEED_WINMAIN, [1], [Define if you need WinMain (Windows)]) CFLAGS="${CFLAGS} -mwindows" fi Index: kitsh/buildsrc/kitsh-0.0/kitInit.c ================================================================== --- kitsh/buildsrc/kitsh-0.0/kitInit.c +++ kitsh/buildsrc/kitsh-0.0/kitInit.c @@ -143,10 +143,18 @@ "set f [open setup.tcl]\n" "set s [read $f]\n" "close $f\n" "}\n" "uplevel #0 $s\n" +#if defined(KIT_INCLUDES_TK) && defined(KIT_TK_VERSION) +# ifndef _WIN32 + "package ifneeded Tk " KIT_TK_VERSION " {\n" + "load {} Tk\n" + "package provide Tk " KIT_TK_VERSION "\n" + "}\n" +# endif +#endif #ifdef _WIN32 "catch {load {} dde}\n" "catch {load {} registry}\n" #endif /* _WIN32 */ "return 0\n"