summaryrefslogtreecommitdiffstats
path: root/unix/configure.in
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2012-12-10 18:45:42 (GMT)
committerdgp <dgp@users.sourceforge.net>2012-12-10 18:45:42 (GMT)
commit90307605832ae8bf5cd7ec028c9b485fbdfe77d7 (patch)
tree708644ff66f62bbb8adc9c3338fa0904b67d0809 /unix/configure.in
parentfddfcf8aea5231055a00f5d969533085b36b8347 (diff)
downloadtk-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/configure.in')
-rw-r--r--unix/configure.in7
1 files changed, 6 insertions, 1 deletions
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}.])