diff options
| author | dgp <dgp@users.sourceforge.net> | 2012-12-10 18:45:42 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2012-12-10 18:45:42 (GMT) |
| commit | 90307605832ae8bf5cd7ec028c9b485fbdfe77d7 (patch) | |
| tree | 708644ff66f62bbb8adc9c3338fa0904b67d0809 /unix | |
| parent | fddfcf8aea5231055a00f5d969533085b36b8347 (diff) | |
| download | tk-90307605832ae8bf5cd7ec028c9b485fbdfe77d7.zip tk-90307605832ae8bf5cd7ec028c9b485fbdfe77d7.tar.gz tk-90307605832ae8bf5cd7ec028c9b485fbdfe77d7.tar.bz2 | |
Set of changes that permits Tk 8.5.14 to build against the released
header files of Tcl 8.6.0. Developed and tested only on linux so far.
A step in the saga to decouple Tcl and Tk releases.
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 2 | ||||
| -rwxr-xr-x | unix/configure | 11 | ||||
| -rw-r--r-- | unix/configure.in | 7 |
3 files changed, 17 insertions, 3 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index c530368..37fabf9 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -373,7 +373,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 cc918fa..3fa4f75 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 d052675..deb271e 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}.]) |