From 489a660ce900537a0e85686980a8aff85446cb44 Mon Sep 17 00:00:00 2001 From: dgp Date: Mon, 30 Oct 2017 15:54:16 +0000 Subject: Permit building on a Tcl 9 foundation. --- unix/configure | 2 ++ unix/configure.ac | 2 ++ 2 files changed, 4 insertions(+) diff --git a/unix/configure b/unix/configure index 72db277..e69ffa9 100755 --- a/unix/configure +++ b/unix/configure @@ -2481,6 +2481,7 @@ $as_echo "could not find ${TCL_BIN_DIR}/tclConfig.sh" >&6; } +if test "${TCL_MAJOR_VERSION}" -lt 9 ; then if test "${TCL_MAJOR_VERSION}" -ne 8 ; then as_fn_error $? "${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6+ Found config for Tcl ${TCL_VERSION}" "$LINENO" 5 @@ -2489,6 +2490,7 @@ if test "${TCL_MINOR_VERSION}" -lt 6 ; then as_fn_error $? "${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6+ Found config for Tcl ${TCL_VERSION}" "$LINENO" 5 fi +fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tclsh" >&5 diff --git a/unix/configure.ac b/unix/configure.ac index acbfff9..733f53e 100644 --- a/unix/configure.ac +++ b/unix/configure.ac @@ -36,6 +36,7 @@ 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}" -lt 9 ; then 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}]) @@ -44,6 +45,7 @@ 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 +fi SC_PROG_TCLSH SC_BUILD_TCLSH -- cgit v0.12