Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 509303a

Browse files
committed
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.
1 parent 64d84ad commit 509303a

File tree

3 files changed

+15
-4
lines changed

3 files changed

+15
-4
lines changed

config/tcl.m4

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
# $PostgreSQL: pgsql/config/tcl.m4,v 1.5 2003/11/29 19:51:17 pgsql Exp $
1+
# $PostgreSQL: pgsql/config/tcl.m4,v 1.6 2008/07/23 17:07:49 petere Exp $
22

33
# Autoconf macros to check for Tcl related things
44

55

66
AC_DEFUN([PGAC_PATH_TCLSH],
7-
[AC_PATH_PROGS(TCLSH, [tclsh tcl])])
7+
[AC_PATH_PROGS(TCLSH, [tclsh tcl])
8+
if test x"$TCLSH" = x""; then
9+
AC_MSG_ERROR([Tcl shell not found])
10+
fi
11+
])
812

913

1014
# PGAC_PATH_TCLCONFIGSH([SEARCH-PATH])

configure

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25032,6 +25032,12 @@ fi
2503225032
test -n "$TCLSH" && break
2503325033
done
2503425034

25035+
if test x"$TCLSH" = x""; then
25036+
{ { echo "$as_me:$LINENO: error: Tcl shell not found" >&5
25037+
echo "$as_me: error: Tcl shell not found" >&2;}
25038+
{ (exit 1); exit 1; }; }
25039+
fi
25040+
2503525041
{ echo "$as_me:$LINENO: checking for tclConfig.sh" >&5
2503625042
echo $ECHO_N "checking for tclConfig.sh... $ECHO_C" >&6; }
2503725043
# Let user override test

doc/src/sgml/installation.sgml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.310 2008/06/05 19:56:09 alvherre Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.311 2008/07/23 17:07:50 petere Exp $ -->
22

33
<chapter id="installation">
44
<title><![%standalone-include[<productname>PostgreSQL</>]]>
@@ -1447,7 +1447,8 @@ su - postgres
14471447
<listitem>
14481448
<para>
14491449
Full path to the Tcl interpreter. This will be used to
1450-
determine the dependencies for building PL/Tcl.
1450+
determine the dependencies for building PL/Tcl, and it will
1451+
be substituted into Tcl scripts.
14511452
</para>
14521453
</listitem>
14531454
</varlistentry>

0 commit comments

Comments
 (0)