diff options
author | dgp <dgp@users.sourceforge.net> | 2012-09-13 19:14:05 (GMT) |
---|---|---|
committer | dgp <dgp@users.sourceforge.net> | 2012-09-13 19:14:05 (GMT) |
commit | a6410b1c5d3a3cdba9f5b63e97c569a758ff1ca2 (patch) | |
tree | bed13a89fd88482c1c9511c5b2827d714863bfd3 /unix | |
parent | 797513ad01f3e2fe7cc68b39e9f3f665b1879324 (diff) | |
parent | 01dc2559dada42bd2c0f7c5c91f2f3403146bfa8 (diff) | |
download | tk-a6410b1c5d3a3cdba9f5b63e97c569a758ff1ca2.zip tk-a6410b1c5d3a3cdba9f5b63e97c569a758ff1ca2.tar.gz tk-a6410b1c5d3a3cdba9f5b63e97c569a758ff1ca2.tar.bz2 |
merge trunk
Diffstat (limited to 'unix')
-rwxr-xr-x | unix/configure | 15 | ||||
-rw-r--r-- | unix/configure.in | 9 |
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 |