diff options
| author | nijtmans@users.sourceforge.net <jan.nijtmans> | 2013-03-30 06:39:59 (GMT) |
|---|---|---|
| committer | nijtmans@users.sourceforge.net <jan.nijtmans> | 2013-03-30 06:39:59 (GMT) |
| commit | 3b7264c1ecbdb713108dacd0732e7992bdd95090 (patch) | |
| tree | ff029bb15a81e35657b8b395450c48e43f3b8c9a /unix | |
| parent | e452a63df80c7197b1a7c0fedc44b6770faab434 (diff) | |
| download | tk-3b7264c1ecbdb713108dacd0732e7992bdd95090.zip tk-3b7264c1ecbdb713108dacd0732e7992bdd95090.tar.gz tk-3b7264c1ecbdb713108dacd0732e7992bdd95090.tar.bz2 | |
Backout [9bc120ced2] and part of [ea8d772054] (change-log entry for [9bc120ced2] only)
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 2 | ||||
| -rwxr-xr-x | unix/configure | 11 | ||||
| -rw-r--r-- | unix/configure.in | 7 |
3 files changed, 3 insertions, 17 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index bfa4bc0..1da2d72 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -372,7 +372,7 @@ TTK_OBJS = \ ttkTagSet.o ttkTheme.o ttkTrace.o ttkTrack.o ttkTreeview.o \ ttkWidget.o ttkStubInit.o -STUB_OBJS = tkStubInit.o +STUB_OBJS = tkStubInit.o tkStubLib.o STUB_LIB_OBJS = tkStubLib.o ttkStubLib.o diff --git a/unix/configure b/unix/configure index de43530..ed0693c 100755 --- a/unix/configure +++ b/unix/configure @@ -1585,16 +1585,7 @@ echo "${ECHO_T}$BUILD_TCLSH" >&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_MINOR_VERSION}" -lt "${TK_MINOR_VERSION}"; then +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 diff --git a/unix/configure.in b/unix/configure.in index 9f59778..85f0a1a 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -39,12 +39,7 @@ SC_LOAD_TCLCONFIG SC_PROG_TCLSH SC_BUILD_TCLSH -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_MINOR_VERSION}" -lt "${TK_MINOR_VERSION}"; then +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}.]) |