From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sat, 10 May 2014 14:48:17 +0000 (-0400)
Subject: Accept tcl 8.6 in configure's probe for tclsh.
X-Git-Tag: REL8_4_22~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8607099a19066927b1c2ee6311a8cf0a64192e07;p=thirdparty%2Fpostgresql.git

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 ae0d3b78bed..a1d3f332d6a 100644
--- 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 84a12fb569c..3787f02cdfb 100755
--- 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