Commit509303a

committed

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

This is required because the value is substituted into the pltcl_*modscripts.

1 parent64d84ad commit509303aCopy full SHA for 509303a

File tree

+15

-4

lines changed

+15

-4

lines changed

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff 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 $`
`2`	`2`
`3`	`3`	`# Autoconf macros to check for Tcl related things`
`4`	`4`
`5`	`5`
`6`	`6`	`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`	`+])`
`8`	`12`
`9`	`13`
`10`	`14`	`# PGAC_PATH_TCLCONFIGSH([SEARCH-PATH])`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -25032,6 +25032,12 @@ fi`
`25032`	`25032`	`test -n "$TCLSH" && break`
`25033`	`25033`	`done`
`25034`	`25034`
	`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`	`+`
`25035`	`25041`	`{ echo "$as_me:$LINENO: checking for tclConfig.sh" >&5`
`25036`	`25042`	`echo $ECHO_N "checking for tclConfig.sh... $ECHO_C" >&6; }`
`25037`	`25043`	`# Let user override test`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff 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 $ -->`
`2`	`2`
`3`	`3`	`<chapter id="installation">`
`4`	`4`	`<title><![%standalone-include[<productname>PostgreSQL</>]]>`
`@@ -1447,7 +1447,8 @@ su - postgres`
`1447`	`1447`	`<listitem>`
`1448`	`1448`	`<para>`
`1449`	`1449`	`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.`
`1451`	`1452`	`</para>`
`1452`	`1453`	`</listitem>`
`1453`	`1454`	`</varlistentry>`

Comments

(0)