Commit62c35b3

committed

Simplify evaluation of TCL_INCLUDE_SPEC.

1 parent9069a5f commit62c35b3Copy full SHA for 62c35b3

File tree

-16

lines changed

-16

lines changed

Lines changed: 2 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -15569,17 +15569,12 @@ fi`
`15569`	`15569`
`15570`	`15570`
`15571`	`15571`	`."$TCL_CONFIG_SH"`
	`15572`	`+eval TCL_INCLUDE_SPEC=\"$TCL_INCLUDE_SPEC\"`
`15572`	`15573`	`eval TCL_LIB_FILE=\"$TCL_LIB_FILE\"`
`15573`	`15574`	`eval TCL_LIBS=\"$TCL_LIBS\"`
`15574`	`15575`	`eval TCL_LIB_SPEC=\"$TCL_LIB_SPEC\"`
`15575`	`15576`	`eval TCL_SHARED_BUILD=\"$TCL_SHARED_BUILD\"`
`15576`	`15577`
`15577`		`-# TCL_INCLUDE_SPEC is only provided in Tcl 8.4 and later`
`15578`		`-iftest"${TCL_INCLUDE_SPEC+set}" =set;then`
`15579`		`-eval TCL_INCLUDE_SPEC=\"$TCL_INCLUDE_SPEC\"`
`15580`		`-else`
`15581`		`-TCL_INCLUDE_SPEC=''`
`15582`		`-fi`
`15583`	`15578`	`fi`
`15584`	`15579`
`15585`	`15580`	`# Check for Tk configuration script tkConfig.sh`
`@@ -16594,12 +16589,12 @@ s,@XGETTEXT@,$XGETTEXT,;t t`
`16594`	`16589`	`s,@localedir@,$localedir,;t t`
`16595`	`16590`	`s,@TCLSH@,$TCLSH,;t t`
`16596`	`16591`	`s,@TCL_CONFIG_SH@,$TCL_CONFIG_SH,;t t`
	`16592`	`+s,@TCL_INCLUDE_SPEC@,$TCL_INCLUDE_SPEC,;t t`
`16597`	`16593`	`s,@TCL_LIB_FILE@,$TCL_LIB_FILE,;t t`
`16598`	`16594`	`s,@TCL_LIBS@,$TCL_LIBS,;t t`
`16599`	`16595`	`s,@TCL_LIB_SPEC@,$TCL_LIB_SPEC,;t t`
`16600`	`16596`	`s,@TCL_SHARED_BUILD@,$TCL_SHARED_BUILD,;t t`
`16601`	`16597`	`s,@TCL_SHLIB_LD_LIBS@,$TCL_SHLIB_LD_LIBS,;t t`
`16602`		`-s,@TCL_INCLUDE_SPEC@,$TCL_INCLUDE_SPEC,;t t`
`16603`	`16598`	`s,@TK_CONFIG_SH@,$TK_CONFIG_SH,;t t`
`16604`	`16599`	`s,@TK_LIBS@,$TK_LIBS,;t t`
`16605`	`16600`	`s,@TK_LIB_SPEC@,$TK_LIB_SPEC,;t t`

Lines changed: 2 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`dnl Process this file with autoconf to produce a configure script.`
`2`		`-dnl $Header: /cvsroot/pgsql/configure.in,v 1.234 2003/01/28 21:57:11 petere Exp $`
	`2`	`+dnl $Header: /cvsroot/pgsql/configure.in,v 1.235 2003/02/11 21:05:35 petere Exp $`
`3`	`3`	`dnl`
`4`	`4`	`dnl Developers, please strive to achieve this order:`
`5`	`5`	`dnl`
`@@ -1077,15 +1077,8 @@ fi`
`1077`	`1077`	`if test "$with_tcl" = yes; then`
`1078`	`1078`	`PGAC_PATH_TCLCONFIGSH([$with_tclconfig])`
`1079`	`1079`	`PGAC_EVAL_TCLCONFIGSH([$TCL_CONFIG_SH],`
`1080`		`- [TCL_LIB_FILE,TCL_LIBS,TCL_LIB_SPEC,TCL_SHARED_BUILD])`
	`1080`	`+ [TCL_INCLUDE_SPEC,TCL_LIB_FILE,TCL_LIBS,TCL_LIB_SPEC,TCL_SHARED_BUILD])`
`1081`	`1081`	`AC_SUBST(TCL_SHLIB_LD_LIBS)dnl don't want to double-evaluate that one`
`1082`		`- # TCL_INCLUDE_SPEC is only provided in Tcl 8.4 and later`
`1083`		`- if test "${TCL_INCLUDE_SPEC+set}" = set; then`
`1084`		`-eval TCL_INCLUDE_SPEC=\"$TCL_INCLUDE_SPEC\"`
`1085`		`- else`
`1086`		`-TCL_INCLUDE_SPEC=''`
`1087`		`- fi`
`1088`		`- AC_SUBST(TCL_INCLUDE_SPEC)dnl`
`1089`	`1082`	`fi`
`1090`	`1083`
`1091`	`1084`	`# Check for Tk configuration script tkConfig.sh`

Comments

(0)