diff options
| author | mdejong <mdejong> | 2005-08-23 18:25:33 (GMT) |
|---|---|---|
| committer | mdejong <mdejong> | 2005-08-23 18:25:33 (GMT) |
| commit | 7c9e8ad4d37025b7a45e2c9cdb46b5a65a5ef4f4 (patch) | |
| tree | c59af7d24b600d7bcd3d9bbfb76f2d99b309fdab /unix/configure.in | |
| parent | 6c3967704d759e1cf47471002f6e0a8d574f22e5 (diff) | |
| download | tk-7c9e8ad4d37025b7a45e2c9cdb46b5a65a5ef4f4.zip tk-7c9e8ad4d37025b7a45e2c9cdb46b5a65a5ef4f4.tar.gz tk-7c9e8ad4d37025b7a45e2c9cdb46b5a65a5ef4f4.tar.bz2 | |
* unix/Makefile.in: Subst BUILD_TCLSH and TCL_EXE.
* unix/configure: Regen.
* unix/configure.in: Update minimum autoconf version
to 2.59. Invoke SC_PROG_TCLSH and SC_BUILD_TCLSH.
* unix/tcl.m4 (SC_PROG_TCLSH, SC_BUILD_TCLSH):
* win/Makefile.in: Subst BUILD_TCLSH and TCL_EXE.
* win/configure: Regen.
* win/configure.in: Update minimum autoconf version
to 2.59. Invoke SC_BUILD_TCLSH.
* win/tcl.m4 (SC_PROG_TCLSH, SC_BUILD_TCLSH):
Split confused search for tclsh on PATH and
build and install locations into two macros.
SC_PROG_TCLSH searches just the PATH.
SC_BUILD_TCLSH determines the name of the tclsh
executable in the Tcl build directory.
[Tcl bug 1160114]
[Tcl patch 1244153]
Diffstat (limited to 'unix/configure.in')
| -rw-r--r-- | unix/configure.in | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/unix/configure.in b/unix/configure.in index a44de8d..cc7996a 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -3,10 +3,10 @@ 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.109 2005/06/07 14:20:18 dkf Exp $ +# RCS: @(#) $Id: configure.in,v 1.110 2005/08/23 18:25:34 mdejong Exp $ AC_INIT([tk],[8.5]) -AC_PREREQ(2.57) +AC_PREREQ(2.59) dnl AC_CONFIG_HEADERS([tkConfig.h]) dnl AC_CONFIG_COMMANDS_PRE([DEFS="-DHAVE_TK_CONFIG_H -imacros tkConfig.h"]) @@ -28,6 +28,9 @@ LOCALES="cs de el en en_gb es fr it nl ru" SC_PATH_TCLCONFIG SC_LOAD_TCLCONFIG +SC_PROG_TCLSH +SC_BUILD_TCLSH + 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}. |