summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2012-09-13 19:13:29 (GMT)
committerdgp <dgp@users.sourceforge.net>2012-09-13 19:13:29 (GMT)
commit0e809f8dd3305b97598597b825333fc85204a6ef (patch)
tree2600609a3ca43a95995e4b085b729ae96442e9a5
parent613b11b96f3952debe6c90fd79fa83c69da66d57 (diff)
downloadtk-0e809f8dd3305b97598597b825333fc85204a6ef.zip
tk-0e809f8dd3305b97598597b825333fc85204a6ef.tar.gz
tk-0e809f8dd3305b97598597b825333fc85204a6ef.tar.bz2
Building Tk 8.6 requires Tcl 8.6 headers.
-rwxr-xr-xunix/configure15
-rw-r--r--unix/configure.in9
2 files changed, 24 insertions, 0 deletions
diff --git a/unix/configure b/unix/configure
index cd7dc8c..110cbcd 100755
--- a/unix/configure
+++ b/unix/configure
@@ -1542,6 +1542,21 @@ echo "${ECHO_T}could not find ${TCL_BIN_DIR}/tclConfig.sh" >&6
+if test "${TCL_MAJOR_VERSION}" -ne 8 ; then
+ { { echo "$as_me:$LINENO: error: ${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6+
+Found config for Tcl ${TCL_VERSION}" >&5
+echo "$as_me: error: ${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6+
+Found config for Tcl ${TCL_VERSION}" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test "${TCL_MINOR_VERSION}" -lt 6 ; then
+ { { echo "$as_me:$LINENO: error: ${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6+
+Found config for Tcl ${TCL_VERSION}" >&5
+echo "$as_me: error: ${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6+
+Found config for Tcl ${TCL_VERSION}" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
echo "$as_me:$LINENO: checking for tclsh" >&5
echo $ECHO_N "checking for tclsh... $ECHO_C" >&6
diff --git a/unix/configure.in b/unix/configure.in
index bfe145c..7964bc2 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -36,6 +36,15 @@ LOCALES="cs da de el en en_gb eo es fr hu it nl pl pt ru sv"
SC_PATH_TCLCONFIG
SC_LOAD_TCLCONFIG
+if test "${TCL_MAJOR_VERSION}" -ne 8 ; then
+ AC_MSG_ERROR([${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6+
+Found config for Tcl ${TCL_VERSION}])
+fi
+if test "${TCL_MINOR_VERSION}" -lt 6 ; then
+ AC_MSG_ERROR([${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6+
+Found config for Tcl ${TCL_VERSION}])
+fi
+
SC_PROG_TCLSH
SC_BUILD_TCLSH