Skip to content

Commit 9bc1b43

Browse files
committed
Accept tcl 8.6 in configure's probe for tclsh.
Usually the search would find plain "tclsh" without any trouble, but some installations might only have the version-numbered flavor of that program. No compatibility problems have been reported with 8.6, so we might as well back-patch this to all active branches. Christoph Berg
1 parent 25c933c commit 9bc1b43

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

config/tcl.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55

66
AC_DEFUN([PGAC_PATH_TCLSH],
7-
[AC_PATH_PROGS(TCLSH, [tclsh tcl tclsh8.5 tclsh85 tclsh8.4 tclsh84 tclsh8.3 tclsh83])
7+
[AC_PATH_PROGS(TCLSH, [tclsh tcl tclsh8.6 tclsh86 tclsh8.5 tclsh85 tclsh8.4 tclsh84 tclsh8.3 tclsh83])
88
if test x"$TCLSH" = x""; then
99
AC_MSG_ERROR([Tcl shell not found])
1010
fi

configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28713,7 +28713,7 @@ fi
2871328713

2871428714
# Check for Tcl configuration script tclConfig.sh
2871528715
if test "$with_tcl" = yes; then
28716-
for ac_prog in tclsh tcl tclsh8.5 tclsh85 tclsh8.4 tclsh84 tclsh8.3 tclsh83
28716+
for ac_prog in tclsh tcl tclsh8.6 tclsh86 tclsh8.5 tclsh85 tclsh8.4 tclsh84 tclsh8.3 tclsh83
2871728717
do
2871828718
# Extract the first word of "$ac_prog", so it can be a program name with args.
2871928719
set dummy $ac_prog; ac_word=$2

0 commit comments

Comments
 (0)