diff --git a/config/tcl.m4 b/config/tcl.m4
index ebe33974fc17bd3f8c161e1cb9ac5a7db38dd57c..094dcd129948d0f24ff9b7767cf7d854dfcb896d 100644
--- a/config/tcl.m4
+++ b/config/tcl.m4
@@ -1,10 +1,14 @@
-# $PostgreSQL: pgsql/config/tcl.m4,v 1.5 2003/11/29 19:51:17 pgsql Exp $
+# $PostgreSQL: pgsql/config/tcl.m4,v 1.6 2008/07/23 17:07:49 petere Exp $
 
 # Autoconf macros to check for Tcl related things
 
 
 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
--- 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 0e4aa90fedfd6400b561ff587a5c31e6a347876d..c787a313882f8b0cb97dddbe3a5db90adbc2c652 100644
--- a/doc/src/sgml/installation.sgml
+++ b/doc/src/sgml/installation.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.310 2008/06/05 19:56:09 alvherre Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.311 2008/07/23 17:07:50 petere Exp $ -->
 
 <chapter id="installation">
  <title><![%standalone-include[<productname>PostgreSQL</>]]>
@@ -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>