summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2012-09-13 19:14:05 (GMT)
committerdgp <dgp@users.sourceforge.net>2012-09-13 19:14:05 (GMT)
commit970db01541fa840ec5e11fa8178a154ee94d5d9f (patch)
treebed13a89fd88482c1c9511c5b2827d714863bfd3
parenta3797a6afe41e049f65e052b16c78f651be1f093 (diff)
parent0e809f8dd3305b97598597b825333fc85204a6ef (diff)
downloadtk-970db01541fa840ec5e11fa8178a154ee94d5d9f.zip
tk-970db01541fa840ec5e11fa8178a154ee94d5d9f.tar.gz
tk-970db01541fa840ec5e11fa8178a154ee94d5d9f.tar.bz2
merge trunk
-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 577b844..7f145ec 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 6860fd9..a7f9fc6 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