diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-11-05 14:21:21 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-11-05 14:21:21 (GMT) |
| commit | 8c4d8a4f1406410662d9c626aa628fc2413b7f10 (patch) | |
| tree | 0852a2f82b768d17c53efa4a22a8866f6cabe560 /tools | |
| parent | d52223f0240cace7cdb7894603c7f6c642a3cbfb (diff) | |
| parent | ded2a799663066ed98c0a0b07d5fc5a661f988d8 (diff) | |
| download | tcl-8c4d8a4f1406410662d9c626aa628fc2413b7f10.zip tcl-8c4d8a4f1406410662d9c626aa628fc2413b7f10.tar.gz tcl-8c4d8a4f1406410662d9c626aa628fc2413b7f10.tar.bz2 | |
Merge core-8-branch. More 8.7 -> 9.0 changes as appropriate
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/configure | 2 | ||||
| -rw-r--r-- | tools/configure.ac | 2 | ||||
| -rwxr-xr-x | tools/tcltk-man2html.tcl | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tools/configure b/tools/configure index 5903cc8..e125786 100755 --- a/tools/configure +++ b/tools/configure @@ -1681,7 +1681,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # not, assume that its top-level directory is a sibling of ours. #-------------------------------------------------------------------- -DEF_VER=8.7 +DEF_VER=9.0 # Check whether --with-tcl was given. diff --git a/tools/configure.ac b/tools/configure.ac index 3caa141..7950578 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -11,7 +11,7 @@ AC_PREREQ(2.69) # not, assume that its top-level directory is a sibling of ours. #-------------------------------------------------------------------- -DEF_VER=8.7 +DEF_VER=9.0 AC_ARG_WITH(tcl, [ --with-tcl=DIR use Tcl $DEF_VER binaries from DIR], TCL_BIN_DIR=$withval, TCL_BIN_DIR=`cd ../../tcl$DEF_VER$TCL_PATCH_LEVEL/unix; pwd`) if test ! -d $TCL_BIN_DIR; then diff --git a/tools/tcltk-man2html.tcl b/tools/tcltk-man2html.tcl index b0c2d8f..82a041c 100755 --- a/tools/tcltk-man2html.tcl +++ b/tools/tcltk-man2html.tcl @@ -4,7 +4,7 @@ if {[catch {package require Tcl 8.6-} msg]} { puts stderr "ERROR: $msg" puts stderr "If running this script from 'make html', set the\ NATIVE_TCLSH environment\nvariable to point to an installed\ - tclsh8.7 (or the equivalent tclsh87.exe\non Windows)." + tclsh9.0 (or the equivalent tclsh90.exe\non Windows)." exit 1 } @@ -22,7 +22,7 @@ if {[catch {package require Tcl 8.6-} msg]} { # Copyright (c) 1995-1997 Roger E. Critchlow Jr # Copyright (c) 2004-2010 Donal K. Fellows -set ::Version "50/8.7" +set ::Version "50/9.0" set ::CSSFILE "docs.css" ## |