* unix/configure.in: Added check that version of Tcl header found

        by configure matches that of the Tk we wish to build.  As long as
        the Tk sources insist on lockstep releases, Tk's configuration should
        verify that's what we have.  [Bug 749088]

        * unix/configure:       autoconf (2.57)

3 files changed, 26 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 85f6888..3c6fc80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2003-10-06  Don Porter  <dgp@users.sourceforge.net>
+
+        * unix/configure.in:    Added check that version of Tcl header found
+        by configure matches that of the Tk we wish to build.  As long as
+        the Tk sources insist on lockstep releases, Tk's configuration should
+        verify that's what we have.  [Bug 749088]
+
+        * unix/configure:       autoconf (2.57)
+
 2003-10-03  Pat Thoyts  <patthoyts@users.sourceforge.net>
 
 	* library/scale.tcl: Clear bug with chording mouse buttons.
diff --git a/unix/configure b/unix/configure
index 51e5007..4b28601 100755
--- a/unix/configure
+++ b/unix/configure
@@ -3510,6 +3510,16 @@ _ACEOF
 
 fi
 
+if test "${TCL_VERSION}" != "${TK_VERSION}"; then
+    { { echo "$as_me:$LINENO: 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}." >&5
+echo "$as_me: 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}." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
 #--------------------------------------------------------------------
 # Recompute the necessary flags to run the compiler
 #--------------------------------------------------------------------
diff --git a/unix/configure.in b/unix/configure.in
index 6e87853..68c6fca 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -3,7 +3,7 @@ dnl	This file is an input file used by the GNU "autoconf" program to
 dnl	generate the file "configure", which is run during Tk installation
 dnl	to configure the system for the local environment.
 #
-# RCS: @(#) $Id: configure.in,v 1.89 2003/09/25 05:36:08 das Exp $
+# RCS: @(#) $Id: configure.in,v 1.90 2003/10/06 15:34:18 dgp Exp $
 
 AC_INIT(../generic/tk.h)
 AC_PREREQ(2.57)
@@ -102,6 +102,12 @@ if test "${TCL_THREADS}" = 1; then
     AC_DEFINE(_THREAD_SAFE)
 fi
 
+if test "${TCL_VERSION}" != "${TK_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
+
 #--------------------------------------------------------------------
 # Recompute the necessary flags to run the compiler
 #--------------------------------------------------------------------