summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--generic/tk.h8
-rw-r--r--generic/tkConsole.c2
-rw-r--r--generic/tkFont.c2
-rw-r--r--generic/tkInt.h5
-rw-r--r--generic/tkIntXlibDecls.h10
-rw-r--r--generic/tkMain.c2
-rw-r--r--generic/tkObj.c50
-rw-r--r--generic/tkStyle.c2
-rw-r--r--generic/tkTest.c2
-rw-r--r--generic/tkWindow.c2
-rw-r--r--library/demos/widget1
-rw-r--r--library/tk.tcl5
-rw-r--r--macosx/tkMacOSXBitmap.c6
-rw-r--r--tests/all.tcl3
-rw-r--r--tests/constraints.tcl2
-rw-r--r--tests/ttk/all.tcl3
-rw-r--r--unix/Makefile.in4
-rwxr-xr-xunix/configure20
-rw-r--r--unix/configure.in12
-rw-r--r--unix/tkAppInit.c2
-rw-r--r--win/Makefile.in2
-rwxr-xr-xwin/configure11
-rw-r--r--win/configure.in7
23 files changed, 84 insertions, 79 deletions
diff --git a/generic/tk.h b/generic/tk.h
index aa9cd22..0c80f55 100644
--- a/generic/tk.h
+++ b/generic/tk.h
@@ -17,7 +17,7 @@
#define _TK
#include <tcl.h>
-#if (TCL_MAJOR_VERSION != 8) || (TCL_MINOR_VERSION < 6)
+#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION < 6)
# error Tk 8.6 must be compiled with tcl.h from Tcl 8.6 or better
#endif
@@ -1503,9 +1503,9 @@ typedef struct Tk_ElementSpec {
#define Tk_Main(argc, argv, proc) Tk_MainEx(argc, argv, proc, \
(Tcl_FindExecutable(argv[0]), (Tcl_CreateInterp)()))
#endif
-const char * Tk_InitStubs(Tcl_Interp *interp, const char *version,
- int exact);
-EXTERN const char * Tk_PkgInitStubsCheck(Tcl_Interp *interp,
+const char * Tk_InitStubs(Tcl_Interp *interp,
+ const char *version, int exact);
+const char * Tk_PkgInitStubsCheck(Tcl_Interp *interp,
const char *version, int exact);
#ifndef USE_TK_STUBS
diff --git a/generic/tkConsole.c b/generic/tkConsole.c
index 12e9353..51dc1a7 100644
--- a/generic/tkConsole.c
+++ b/generic/tkConsole.c
@@ -223,7 +223,7 @@ Tk_InitConsoleChannels(
* Ensure that we are getting a compatible version of Tcl.
*/
- if (Tcl_InitStubs(interp, "8.6", 0) == NULL) {
+ if (Tcl_InitStubs(interp, "8.6-", 0) == NULL) {
return;
}
diff --git a/generic/tkFont.c b/generic/tkFont.c
index 4485df8..e9b8dab 100644
--- a/generic/tkFont.c
+++ b/generic/tkFont.c
@@ -346,7 +346,7 @@ static void UpdateDependentFonts(TkFontInfo *fiPtr,
* font object points to the TkFont structure for the font, or NULL.
*/
-const Tcl_ObjType tkFontObjType = {
+Tcl_ObjType tkFontObjType = {
"font", /* name */
FreeFontObjProc, /* freeIntRepProc */
DupFontObjProc, /* dupIntRepProc */
diff --git a/generic/tkInt.h b/generic/tkInt.h
index 933fa5e..3f9f5da 100644
--- a/generic/tkInt.h
+++ b/generic/tkInt.h
@@ -926,7 +926,7 @@ MODULE_SCOPE const Tcl_ObjType tkBorderObjType;
MODULE_SCOPE const Tcl_ObjType tkBitmapObjType;
MODULE_SCOPE const Tcl_ObjType tkColorObjType;
MODULE_SCOPE const Tcl_ObjType tkCursorObjType;
-MODULE_SCOPE const Tcl_ObjType tkFontObjType;
+MODULE_SCOPE Tcl_ObjType tkFontObjType;
MODULE_SCOPE const Tcl_ObjType tkStateKeyObjType;
MODULE_SCOPE const Tcl_ObjType tkTextIndexType;
@@ -1246,6 +1246,9 @@ MODULE_SCOPE int TkOldTestInit(Tcl_Interp *interp);
MODULE_SCOPE int TkplatformtestInit(Tcl_Interp *interp);
#endif
+#undef Tcl_AddErrorInfo
+#define Tcl_AddErrorInfo(interp, message) \
+ Tcl_AppendObjToErrorInfo((interp), Tcl_NewStringObj((message), -1))
#endif /* _TKINT */
/*
diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h
index 70c63d5..c8038cf 100644
--- a/generic/tkIntXlibDecls.h
+++ b/generic/tkIntXlibDecls.h
@@ -25,9 +25,15 @@
#include "X11/Xutil.h"
-#ifdef BUILD_tk
+#ifndef EXTERN
+# define EXTERN extern TCL_STORAGE_CLASS
+#endif
+
#undef TCL_STORAGE_CLASS
-#define TCL_STORAGE_CLASS DLLEXPORT
+#ifdef BUILD_tk
+# define TCL_STORAGE_CLASS DLLEXPORT
+#else
+# define TCL_STORAGE_CLASS DLLIMPORT
#endif
typedef int (*XAfterFunction) ( /* WARNING, this type not in Xlib spec */
diff --git a/generic/tkMain.c b/generic/tkMain.c
index 9d12693..b00b764 100644
--- a/generic/tkMain.c
+++ b/generic/tkMain.c
@@ -187,7 +187,7 @@ Tk_MainEx(
* Ensure that we are getting a compatible version of Tcl.
*/
- if (Tcl_InitStubs(interp, "8.6", 0) == NULL) {
+ if (Tcl_InitStubs(interp, "8.6-", 0) == NULL) {
if (Tcl_InitStubs(interp, "8.1", 0) == NULL) {
abort();
} else {
diff --git a/generic/tkObj.c b/generic/tkObj.c
index 7c09656..13e97db 100644
--- a/generic/tkObj.c
+++ b/generic/tkObj.c
@@ -99,7 +99,7 @@ static int SetWindowFromAny(Tcl_Interp *interp, Tcl_Obj *objPtr);
* initial display-independant settings.
*/
-static const Tcl_ObjType pixelObjType = {
+static Tcl_ObjType pixelObjType = {
"pixel", /* name */
FreePixelInternalRep, /* freeIntRepProc */
DupPixelInternalRep, /* dupIntRepProc */
@@ -113,7 +113,7 @@ static const Tcl_ObjType pixelObjType = {
* initial display-independant settings.
*/
-static const Tcl_ObjType mmObjType = {
+static Tcl_ObjType mmObjType = {
"mm", /* name */
FreeMMInternalRep, /* freeIntRepProc */
DupMMInternalRep, /* dupIntRepProc */
@@ -126,7 +126,7 @@ static const Tcl_ObjType mmObjType = {
* Tcl object.
*/
-static const Tcl_ObjType windowObjType = {
+static Tcl_ObjType windowObjType = {
"window", /* name */
FreeWindowInternalRep, /* freeIntRepProc */
DupWindowInternalRep, /* dupIntRepProc */
@@ -153,8 +153,12 @@ GetTypeCache(void)
Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
if (tsdPtr->doubleTypePtr == NULL) {
- tsdPtr->doubleTypePtr = Tcl_GetObjType("double");
- tsdPtr->intTypePtr = Tcl_GetObjType("int");
+ Tcl_Obj *obj = Tcl_NewDoubleObj(0.0);
+ tsdPtr->doubleTypePtr = obj->typePtr;
+ Tcl_DecrRefCount(obj);
+ obj = Tcl_NewLongObj(0);
+ tsdPtr->intTypePtr = obj->typePtr;
+ Tcl_DecrRefCount(obj);
}
return tsdPtr;
}
@@ -207,14 +211,14 @@ GetPixelsFromObjEx(
ThreadSpecificData *typeCache = GetTypeCache();
if (objPtr->typePtr == typeCache->doubleTypePtr) {
- (void) Tcl_GetDoubleFromObj(interp, objPtr, &d);
+ Tcl_GetDoubleFromObj(interp, objPtr, &d);
if (dblPtr != NULL) {
*dblPtr = d;
}
*intPtr = (int) (d<0 ? d-0.5 : d+0.5);
return TCL_OK;
} else if (objPtr->typePtr == typeCache->intTypePtr) {
- (void) Tcl_GetIntFromObj(interp, objPtr, intPtr);
+ Tcl_GetIntFromObj(interp, objPtr, intPtr);
if (dblPtr) {
*dblPtr = (double) (*intPtr);
}
@@ -1118,19 +1122,31 @@ TkParsePadAmount(
*----------------------------------------------------------------------
*/
+#define registerObjType(type) \
+ ((void (*)(const Tcl_ObjType *))((&(tclStubsPtr->tcl_PkgProvideEx))[211]))(&type)
+
void
TkRegisterObjTypes(void)
{
- Tcl_RegisterObjType(&tkBorderObjType);
- Tcl_RegisterObjType(&tkBitmapObjType);
- Tcl_RegisterObjType(&tkColorObjType);
- Tcl_RegisterObjType(&tkCursorObjType);
- Tcl_RegisterObjType(&tkFontObjType);
- Tcl_RegisterObjType(&mmObjType);
- Tcl_RegisterObjType(&pixelObjType);
- Tcl_RegisterObjType(&tkStateKeyObjType);
- Tcl_RegisterObjType(&windowObjType);
- Tcl_RegisterObjType(&tkTextIndexType);
+ /* When running in Tcl 9, no need to Register the objTypes, and
+ * no need to provide fromAnyProc's. */
+ if ((*((&(tclStubsPtr->tcl_PkgProvideEx))[77])) == NULL) {
+ tkFontObjType.setFromAnyProc = NULL;
+ mmObjType.setFromAnyProc = NULL;
+ pixelObjType.setFromAnyProc = NULL;
+ windowObjType.setFromAnyProc = NULL;
+ return;
+ }
+ registerObjType(tkBorderObjType);
+ registerObjType(tkBitmapObjType);
+ registerObjType(tkColorObjType);
+ registerObjType(tkCursorObjType);
+ registerObjType(tkFontObjType);
+ registerObjType(mmObjType);
+ registerObjType(pixelObjType);
+ registerObjType(tkStateKeyObjType);
+ registerObjType(windowObjType);
+ registerObjType(tkTextIndexType);
}
/*
diff --git a/generic/tkStyle.c b/generic/tkStyle.c
index e7401df..ea10d0f 100644
--- a/generic/tkStyle.c
+++ b/generic/tkStyle.c
@@ -155,7 +155,7 @@ static const Tcl_ObjType styleObjType = {
FreeStyleObjProc, /* freeIntRepProc */
DupStyleObjProc, /* dupIntRepProc */
NULL, /* updateStringProc */
- SetStyleFromAny /* setFromAnyProc */
+ NULL /* setFromAnyProc */
};
/*
diff --git a/generic/tkTest.c b/generic/tkTest.c
index 03431c9..10c4643 100644
--- a/generic/tkTest.c
+++ b/generic/tkTest.c
@@ -220,7 +220,7 @@ Tktest_Init(
{
static int initialized = 0;
- if (Tcl_InitStubs(interp, "8.1", 0) == NULL) {
+ if (Tcl_InitStubs(interp, "8.6-", 0) == NULL) {
return TCL_ERROR;
}
if (Tk_InitStubs(interp, TK_VERSION, 0) == NULL) {
diff --git a/generic/tkWindow.c b/generic/tkWindow.c
index 91806cf..d9296d2 100644
--- a/generic/tkWindow.c
+++ b/generic/tkWindow.c
@@ -3050,7 +3050,7 @@ Initialize(
* Ensure that we are getting a compatible version of Tcl.
*/
- if (Tcl_InitStubs(interp, "8.6", 0) == NULL) {
+ if (Tcl_InitStubs(interp, "8.6-", 0) == NULL) {
return TCL_ERROR;
}
diff --git a/library/demos/widget b/library/demos/widget
index 8b92f9a..08aada1 100644
--- a/library/demos/widget
+++ b/library/demos/widget
@@ -10,7 +10,6 @@ exec wish "$0" ${1+"$@"}
# separate ".tcl" files is this directory, which are sourced by this script as
# needed.
-package require Tcl 8.5
package require Tk 8.5
package require msgcat
diff --git a/library/tk.tcl b/library/tk.tcl
index 267a7bb..5ed1724 100644
--- a/library/tk.tcl
+++ b/library/tk.tcl
@@ -10,11 +10,8 @@
# See the file "license.terms" for information on usage and redistribution of
# this file, and for a DISCLAIMER OF ALL WARRANTIES.
-# Insist on running with compatible version of Tcl
-package require Tcl 8.6
# Verify that we have Tk binary and script components from the same release
-package require -exact Tk 8.6.0
-
+package require -exact Tk 8.6.0
# Create a ::tk namespace
namespace eval ::tk {
# Set up the msgcat commands
diff --git a/macosx/tkMacOSXBitmap.c b/macosx/tkMacOSXBitmap.c
index 52768c6..a50ec74 100644
--- a/macosx/tkMacOSXBitmap.c
+++ b/macosx/tkMacOSXBitmap.c
@@ -392,7 +392,8 @@ TkMacOSXIconBitmapObjCmd(
"value");
goto end;
}
- name = Tcl_GetStringFromObj(objv[i++], &len);
+ name = Tcl_GetStringFromObj(objv[i], &len);
+ ++i;
if (!len) {
Tcl_SetObjResult(interp, Tcl_NewStringObj("empty bitmap name", -1));
Tcl_SetErrorCode(interp, "TK", "MACBITMAP", "BAD", NULL);
@@ -408,7 +409,8 @@ TkMacOSXIconBitmapObjCmd(
sizeof(char *), "kind", TCL_EXACT, &ib.kind) != TCL_OK) {
goto end;
}
- value = Tcl_GetStringFromObj(objv[i++], &len);
+ value = Tcl_GetStringFromObj(objv[i], &len);
+ ++i;
if (!len) {
Tcl_SetObjResult(interp, Tcl_NewStringObj("empty bitmap value", -1));
Tcl_SetErrorCode(interp, "TK", "MACBITMAP", "EMPTY", NULL);
diff --git a/tests/all.tcl b/tests/all.tcl
index 7f57dc2..884877b 100644
--- a/tests/all.tcl
+++ b/tests/all.tcl
@@ -9,9 +9,8 @@
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-package require Tcl 8.5
+package require Tk 8.5;# This is the Tk test suite; fail early if no Tk!
package require tcltest 2.2
-package require Tk ;# This is the Tk test suite; fail early if no Tk!
tcltest::configure {*}$argv
tcltest::configure -testdir [file normalize [file dirname [info script]]]
tcltest::configure -loadfile \
diff --git a/tests/constraints.tcl b/tests/constraints.tcl
index e28b159..b694973 100644
--- a/tests/constraints.tcl
+++ b/tests/constraints.tcl
@@ -5,8 +5,6 @@ if {[namespace exists tk::test]} {
return
}
-package require Tcl 8.4
-
package require Tk 8.4
tk appname tktest
wm title . tktest
diff --git a/tests/ttk/all.tcl b/tests/ttk/all.tcl
index da2e316..19f6e4e 100644
--- a/tests/ttk/all.tcl
+++ b/tests/ttk/all.tcl
@@ -9,9 +9,8 @@
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-package require Tcl 8.5
+package require Tk 8.5;# This is the Tk test suite; fail early if no Tk!
package require tcltest 2.2
-package require Tk ;# This is the Tk test suite; fail early if no Tk!
tcltest::configure {*}$argv
tcltest::configure -testdir [file normalize [file dirname [info script]]]
tcltest::configure -loadfile \
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 23df9dd..67ddbb9 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -187,7 +187,7 @@ KEYSYM_FLAGS =
# Tk does not used deprecated Tcl constructs so it should
# compile fine with -DTCL_NO_DEPRECATED. To remove its own
# set of deprecated code uncomment the second line.
-NO_DEPRECATED_FLAGS = -DTCL_NO_DEPRECATED
+NO_DEPRECATED_FLAGS =
#NO_DEPRECATED_FLAGS = -DTCL_NO_DEPRECATED -DTK_NO_DEPRECATED
# Some versions of make, like SGI's, use the following variable to
@@ -727,7 +727,7 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) ${WISH_EXE}
echo "Creating package index $(PKG_INDEX)"; \
rm -f "$(PKG_INDEX)"; \
(\
- echo "if {[catch {package present Tcl 8.6.0}]} return";\
+ echo "if {[catch {package present Tcl 8.6.0-}]} return";\
relative=`echo | awk '{ORS=" "; split("$(TK_PKG_DIR)",a,"/"); for (f in a) {print ".."}}'`;\
if test "x$(DLL_INSTALL_DIR)" != "x$(BIN_INSTALL_DIR)"; then \
echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL) [list load [file normalize [file join \$$dir $${relative}$(TK_LIB_FILE)]] Tk]";\
diff --git a/unix/configure b/unix/configure
index b0d5f3b..7847419 100755
--- a/unix/configure
+++ b/unix/configure
@@ -1541,22 +1541,20 @@ 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;}
+if test "${TCL_MAJOR_VERSION}" == "${TK_MAJOR_VERSION}"; then
+if test "${TCL_MINOR_VERSION}" -lt "${TK_MINOR_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
-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
if test "${ac_cv_path_tclsh+set}" = set; then
diff --git a/unix/configure.in b/unix/configure.in
index 98b9e0a..db70c80 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -36,15 +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}])
+if test "${TCL_MAJOR_VERSION}" == "${TK_MAJOR_VERSION}"; then
+if test "${TCL_MINOR_VERSION}" -lt "${TK_MINOR_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
-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
diff --git a/unix/tkAppInit.c b/unix/tkAppInit.c
index 9a0b053..f2ae8ca 100644
--- a/unix/tkAppInit.c
+++ b/unix/tkAppInit.c
@@ -12,8 +12,6 @@
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*/
-#undef BUILD_tk
-#undef STATIC_BUILD
#include "tk.h"
#ifdef TK_TEST
diff --git a/win/Makefile.in b/win/Makefile.in
index 5c45112..96587b6 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -486,7 +486,7 @@ install-binaries: binaries
@echo "Creating package index $(PKG_INDEX)";
@$(RM) $(PKG_INDEX);
@(\
- echo "if {[catch {package present Tcl 8.6.0}]} return";\
+ echo "if {[catch {package present Tcl 8.6.0-}]} return";\
echo "if {(\$$::tcl_platform(platform) eq \"unix\") && ([info exists ::env(DISPLAY)]";\
echo " || ([info exists ::argv] && (\"-display\" in \$$::argv)))} {";\
echo " package ifneeded Tk $(VERSION)$(PATCH_LEVEL) [list load [file normalize [file join \$$dir .. .. bin libtk$(VERSION).dll]] Tk]";\
diff --git a/win/configure b/win/configure
index 9efd2a9..13c4878 100755
--- a/win/configure
+++ b/win/configure
@@ -3284,15 +3284,7 @@ echo "${ECHO_T}could not find ${TCL_BIN_DIR}/tclConfig.sh" >&6
-if test "${TCL_MAJOR_VERSION}" != "${TK_MAJOR_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
+if test "${TCL_MAJOR_VERSION}" == "${TK_MAJOR_VERSION}"; then
if test "${TCL_MINOR_VERSION}" -lt "${TK_MINOR_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}.
@@ -3302,6 +3294,7 @@ 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
+fi
#--------------------------------------------------------------------
# The statements below define a collection of compile flags. This
diff --git a/win/configure.in b/win/configure.in
index 709e64e..99878ba 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -81,16 +81,13 @@ SC_ENABLE_SHARED
SC_PATH_TCLCONFIG($TK_PATCH_LEVEL)
SC_LOAD_TCLCONFIG
-if test "${TCL_MAJOR_VERSION}" != "${TK_MAJOR_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
+if test "${TCL_MAJOR_VERSION}" == "${TK_MAJOR_VERSION}"; then
if test "${TCL_MINOR_VERSION}" -lt "${TK_MINOR_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
+fi
#--------------------------------------------------------------------
# The statements below define a collection of compile flags. This
generated by cgit v0.12 at 2025-02-20 09:05:46 (GMT)