diff options
| author | dgp <dgp@users.sourceforge.net> | 2013-03-22 15:58:37 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2013-03-22 15:58:37 (GMT) |
| commit | 17122f4259e29006d21bc11f24d436c11607b526 (patch) | |
| tree | 69590f0adcdefc905674b176ceac2001f9924231 | |
| parent | 80f69c509189e9b43a365f5cdcbc7d3721775466 (diff) | |
| parent | 45bc4b8ed5e03bb50fa2d084bc505d27fadd5db7 (diff) | |
| download | tk-17122f4259e29006d21bc11f24d436c11607b526.zip tk-17122f4259e29006d21bc11f24d436c11607b526.tar.gz tk-17122f4259e29006d21bc11f24d436c11607b526.tar.bz2 | |
merge 8.5
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | generic/tkWindow.c | 4 | ||||
| -rw-r--r-- | unix/Makefile.in | 2 | ||||
| -rwxr-xr-x | unix/configure | 11 | ||||
| -rw-r--r-- | unix/configure.in | 7 |
5 files changed, 25 insertions, 7 deletions
@@ -1,3 +1,11 @@ +2013-03-22 Don Porter <dgp@users.sourceforge.net> + + * generic/tkWindow.c: Updates so that Tk 8.5.14+ will be able to + * unix/Makefile.in: configure and build against Tcl 8.6+ + * unix/configure.in: header files. + + * unix/configure: autoconf-2.59 + 2013-03-13 Jan Nijtmans <nijtmans@users.sf.net> * unix/tcl.m4: Patch by Andrew Shadura, providing better support for diff --git a/generic/tkWindow.c b/generic/tkWindow.c index ac69455..2901256 100644 --- a/generic/tkWindow.c +++ b/generic/tkWindow.c @@ -3275,10 +3275,6 @@ Initialize( Tcl_SetMainLoop(Tk_MainLoop); -#undef Tk_InitStubs - - Tk_InitStubs(interp, TK_VERSION, 1); - /* * Initialized the themed widget set */ diff --git a/unix/Makefile.in b/unix/Makefile.in index 1da2d72..bfa4bc0 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -372,7 +372,7 @@ TTK_OBJS = \ ttkTagSet.o ttkTheme.o ttkTrace.o ttkTrack.o ttkTreeview.o \ ttkWidget.o ttkStubInit.o -STUB_OBJS = tkStubInit.o tkStubLib.o +STUB_OBJS = tkStubInit.o STUB_LIB_OBJS = tkStubLib.o ttkStubLib.o diff --git a/unix/configure b/unix/configure index ed0693c..de43530 100755 --- a/unix/configure +++ b/unix/configure @@ -1585,7 +1585,16 @@ echo "${ECHO_T}$BUILD_TCLSH" >&6 -if test "${TCL_VERSION}" != "${TK_VERSION}"; then +if test "${TCL_MAJOR_VERSION}" != "${TK_MAJOR_VERSION}"; then + { { echo "$as_me:$LINENO: error: ${TCL_BIN_DIR}/tclConfig.sh is for Tcl ${TCL_VERSION}. +Tk ${TK_VERSION}${TK_PATCH_LEVEL} needs Tcl ${TK_VERSION}. +Use --with-tcl= option to indicate location of tclConfig.sh file for Tcl ${TK_VERSION}." >&5 +echo "$as_me: error: ${TCL_BIN_DIR}/tclConfig.sh is for Tcl ${TCL_VERSION}. +Tk ${TK_VERSION}${TK_PATCH_LEVEL} needs Tcl ${TK_VERSION}. +Use --with-tcl= option to indicate location of tclConfig.sh file for Tcl ${TK_VERSION}." >&2;} + { (exit 1); exit 1; }; } +fi +if test "${TCL_MINOR_VERSION}" -lt "${TK_MINOR_VERSION}"; then { { echo "$as_me:$LINENO: error: ${TCL_BIN_DIR}/tclConfig.sh is for Tcl ${TCL_VERSION}. Tk ${TK_VERSION}${TK_PATCH_LEVEL} needs Tcl ${TK_VERSION}. Use --with-tcl= option to indicate location of tclConfig.sh file for Tcl ${TK_VERSION}." >&5 diff --git a/unix/configure.in b/unix/configure.in index 85f0a1a..9f59778 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -39,7 +39,12 @@ SC_LOAD_TCLCONFIG SC_PROG_TCLSH SC_BUILD_TCLSH -if test "${TCL_VERSION}" != "${TK_VERSION}"; then +if test "${TCL_MAJOR_VERSION}" != "${TK_MAJOR_VERSION}"; then + AC_MSG_ERROR([${TCL_BIN_DIR}/tclConfig.sh is for Tcl ${TCL_VERSION}. +Tk ${TK_VERSION}${TK_PATCH_LEVEL} needs Tcl ${TK_VERSION}. +Use --with-tcl= option to indicate location of tclConfig.sh file for Tcl ${TK_VERSION}.]) +fi +if test "${TCL_MINOR_VERSION}" -lt "${TK_MINOR_VERSION}"; then AC_MSG_ERROR([${TCL_BIN_DIR}/tclConfig.sh is for Tcl ${TCL_VERSION}. Tk ${TK_VERSION}${TK_PATCH_LEVEL} needs Tcl ${TK_VERSION}. Use --with-tcl= option to indicate location of tclConfig.sh file for Tcl ${TK_VERSION}.]) |