summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Eisentraut2008-07-23 17:07:50 +0000
committerPeter Eisentraut2008-07-23 17:07:50 +0000
commitc8b0d53c711e9ee094f2ba8b04d542021682b1b7 (patch)
tree17f5ee88e646beeeecfc01e47ae255a2dd23eab8
parent9a11cd1d72b645c171efbf1c037cc2f26f8d926e (diff)
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.
-rw-r--r--config/tcl.m46
-rwxr-xr-xconfigure6
-rw-r--r--doc/src/sgml/installation.sgml3
3 files changed, 13 insertions, 2 deletions
diff --git a/config/tcl.m4 b/config/tcl.m4
index 76f440a4f7..faa5bf71d4 100644
--- 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 ed1e4b0b95..8029882b01 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 5c7a8b5237..1438269b34 100644
--- 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>