Abort if Tcl support was configured and no tcl shell was found.

This is required because the value is substituted into the pltcl_*mod
scripts.

diff --git a/config/tcl.m4 b/config/tcl.m4
index 76f440a4f7a8b86b5731b4f5aed77e844700b165..faa5bf71d4e278857f1d75f35cb16a95fa78e75f 100644 (file)
--- a/config/tcl.m4
+++ b/config/tcl.m4
@@ -4,7 +4,11 @@
 
 
 AC_DEFUN([PGAC_PATH_TCLSH],
-         [AC_PATH_PROGS(TCLSH, [tclsh tcl])])
+[AC_PATH_PROGS(TCLSH, [tclsh tcl])
+if test x"$TCLSH" = x""; then
+  AC_MSG_ERROR([Tcl shell not found])
+fi
+])
 
 
 # PGAC_PATH_TCLCONFIGSH([SEARCH-PATH])

diff --git a/configure b/configure
index ed1e4b0b95d18f0a68b819759a5910909cc75b32..8029882b01d54ad360dd841f22e445d0f0b2e51c 100755 (executable)
--- a/configure
+++ b/configure
@@ -25032,6 +25032,12 @@ fi
   test -n "$TCLSH" && break
 done
 
+if test x"$TCLSH" = x""; then
+  { { echo "$as_me:$LINENO: error: Tcl shell not found" >&5
+echo "$as_me: error: Tcl shell not found" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
 { echo "$as_me:$LINENO: checking for tclConfig.sh" >&5
 echo $ECHO_N "checking for tclConfig.sh... $ECHO_C" >&6; }
 # Let user override test

diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml
index 5c7a8b5237f0faa552e777372fe099d82b8bfb5f..1438269b34ff5510770fd4a27f35076299641c18 100644 (file)
--- a/doc/src/sgml/installation.sgml
+++ b/doc/src/sgml/installation.sgml
@@ -1447,7 +1447,8 @@ su - postgres
        <listitem>
         <para>
          Full path to the Tcl interpreter.  This will be used to
-         determine the dependencies for building PL/Tcl.
+         determine the dependencies for building PL/Tcl, and it will
+         be substituted into Tcl scripts.
         </para>
        </listitem>
       </varlistentry>