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

diff --git a/config/tcl.m4 b/config/tcl.m4
index ae0d3b78bed7568e5885c7b34e31bd448a4ef267..a1d3f332d6a0e7f118d8943886f1b4e5a66fd23d 100644 (file)
--- a/config/tcl.m4
+++ b/config/tcl.m4
@@ -4,7 +4,7 @@
 
 
 AC_DEFUN([PGAC_PATH_TCLSH],
-[AC_PATH_PROGS(TCLSH, [tclsh tcl tclsh8.5 tclsh85 tclsh8.4 tclsh84 tclsh8.3 tclsh83])
+[AC_PATH_PROGS(TCLSH, [tclsh tcl tclsh8.6 tclsh86 tclsh8.5 tclsh85 tclsh8.4 tclsh84 tclsh8.3 tclsh83])
 if test x"$TCLSH" = x""; then
   AC_MSG_ERROR([Tcl shell not found])
 fi

diff --git a/configure b/configure
index 84a12fb569c39aeda5ef9ad529fd53b8dfb27f86..3787f02cdfbc2f45081a3a3357890979e60c3bab 100755 (executable)
--- a/configure
+++ b/configure
@@ -26619,7 +26619,7 @@ fi
 
 # Check for Tcl configuration script tclConfig.sh
 if test "$with_tcl" = yes; then
-    for ac_prog in tclsh tcl tclsh8.5 tclsh85 tclsh8.4 tclsh84 tclsh8.3 tclsh83
+    for ac_prog in tclsh tcl tclsh8.6 tclsh86 tclsh8.5 tclsh85 tclsh8.4 tclsh84 tclsh8.3 tclsh83
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2