Commit 62c35b30 authored by Peter Eisentraut's avatar Peter Eisentraut

Simplify evaluation of TCL_INCLUDE_SPEC.

parent 9069a5fc
...@@ -15569,17 +15569,12 @@ fi ...@@ -15569,17 +15569,12 @@ fi
. "$TCL_CONFIG_SH" . "$TCL_CONFIG_SH"
eval TCL_INCLUDE_SPEC=\"$TCL_INCLUDE_SPEC\"
eval TCL_LIB_FILE=\"$TCL_LIB_FILE\" eval TCL_LIB_FILE=\"$TCL_LIB_FILE\"
eval TCL_LIBS=\"$TCL_LIBS\" eval TCL_LIBS=\"$TCL_LIBS\"
eval TCL_LIB_SPEC=\"$TCL_LIB_SPEC\" eval TCL_LIB_SPEC=\"$TCL_LIB_SPEC\"
eval TCL_SHARED_BUILD=\"$TCL_SHARED_BUILD\" eval TCL_SHARED_BUILD=\"$TCL_SHARED_BUILD\"
# TCL_INCLUDE_SPEC is only provided in Tcl 8.4 and later
if test "${TCL_INCLUDE_SPEC+set}" = set; then
eval TCL_INCLUDE_SPEC=\"$TCL_INCLUDE_SPEC\"
else
TCL_INCLUDE_SPEC=''
fi
fi fi
# Check for Tk configuration script tkConfig.sh # Check for Tk configuration script tkConfig.sh
...@@ -16594,12 +16589,12 @@ s,@XGETTEXT@,$XGETTEXT,;t t ...@@ -16594,12 +16589,12 @@ s,@XGETTEXT@,$XGETTEXT,;t t
s,@localedir@,$localedir,;t t s,@localedir@,$localedir,;t t
s,@TCLSH@,$TCLSH,;t t s,@TCLSH@,$TCLSH,;t t
s,@TCL_CONFIG_SH@,$TCL_CONFIG_SH,;t t s,@TCL_CONFIG_SH@,$TCL_CONFIG_SH,;t t
s,@TCL_INCLUDE_SPEC@,$TCL_INCLUDE_SPEC,;t t
s,@TCL_LIB_FILE@,$TCL_LIB_FILE,;t t s,@TCL_LIB_FILE@,$TCL_LIB_FILE,;t t
s,@TCL_LIBS@,$TCL_LIBS,;t t s,@TCL_LIBS@,$TCL_LIBS,;t t
s,@TCL_LIB_SPEC@,$TCL_LIB_SPEC,;t t s,@TCL_LIB_SPEC@,$TCL_LIB_SPEC,;t t
s,@TCL_SHARED_BUILD@,$TCL_SHARED_BUILD,;t t s,@TCL_SHARED_BUILD@,$TCL_SHARED_BUILD,;t t
s,@TCL_SHLIB_LD_LIBS@,$TCL_SHLIB_LD_LIBS,;t t s,@TCL_SHLIB_LD_LIBS@,$TCL_SHLIB_LD_LIBS,;t t
s,@TCL_INCLUDE_SPEC@,$TCL_INCLUDE_SPEC,;t t
s,@TK_CONFIG_SH@,$TK_CONFIG_SH,;t t s,@TK_CONFIG_SH@,$TK_CONFIG_SH,;t t
s,@TK_LIBS@,$TK_LIBS,;t t s,@TK_LIBS@,$TK_LIBS,;t t
s,@TK_LIB_SPEC@,$TK_LIB_SPEC,;t t s,@TK_LIB_SPEC@,$TK_LIB_SPEC,;t t
......
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
dnl $Header: /cvsroot/pgsql/configure.in,v 1.234 2003/01/28 21:57:11 petere Exp $ dnl $Header: /cvsroot/pgsql/configure.in,v 1.235 2003/02/11 21:05:35 petere Exp $
dnl dnl
dnl Developers, please strive to achieve this order: dnl Developers, please strive to achieve this order:
dnl dnl
...@@ -1077,15 +1077,8 @@ fi ...@@ -1077,15 +1077,8 @@ fi
if test "$with_tcl" = yes; then if test "$with_tcl" = yes; then
PGAC_PATH_TCLCONFIGSH([$with_tclconfig]) PGAC_PATH_TCLCONFIGSH([$with_tclconfig])
PGAC_EVAL_TCLCONFIGSH([$TCL_CONFIG_SH], PGAC_EVAL_TCLCONFIGSH([$TCL_CONFIG_SH],
[TCL_LIB_FILE,TCL_LIBS,TCL_LIB_SPEC,TCL_SHARED_BUILD]) [TCL_INCLUDE_SPEC,TCL_LIB_FILE,TCL_LIBS,TCL_LIB_SPEC,TCL_SHARED_BUILD])
AC_SUBST(TCL_SHLIB_LD_LIBS)dnl don't want to double-evaluate that one AC_SUBST(TCL_SHLIB_LD_LIBS)dnl don't want to double-evaluate that one
# TCL_INCLUDE_SPEC is only provided in Tcl 8.4 and later
if test "${TCL_INCLUDE_SPEC+set}" = set; then
eval TCL_INCLUDE_SPEC=\"$TCL_INCLUDE_SPEC\"
else
TCL_INCLUDE_SPEC=''
fi
AC_SUBST(TCL_INCLUDE_SPEC)dnl
fi fi
# Check for Tk configuration script tkConfig.sh # Check for Tk configuration script tkConfig.sh
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment