diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2014-05-10 10:48:11 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2014-05-10 10:48:11 -0400 |
| commit | 8bd328eaee0b3a9d96e5e2f0f6a420ffe05bf4d2 (patch) | |
| tree | 8cb3d47936c8a39f52d059b2b7b89ac901780fa3 | |
| parent | bb837d75fa30e785af01c1e627e1cae9ba28e424 (diff) | |
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
| -rw-r--r-- | config/tcl.m4 | 2 | ||||
| -rwxr-xr-x | configure | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/tcl.m4 b/config/tcl.m4 index e8860573a65..a9fe7ba5cc1 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 47e1d416d2f..dbc069e47ca 100755 --- a/configure +++ b/configure @@ -28815,7 +28815,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 |