mirrors
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify evaluation of TCL_INCLUDE_SPEC.

This commit is contained in:
Peter Eisentraut 2003-02-11 21:05:35 +00:00
parent 9069a5fc33
commit 62c35b3098
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure vendored
View File

@ -15569,17 +15569,12 @@ fi
. "$TCL_CONFIG_SH"
eval TCL_INCLUDE_SPEC=\"$TCL_INCLUDE_SPEC\"
eval TCL_LIB_FILE=\"$TCL_LIB_FILE\"
eval TCL_LIBS=\"$TCL_LIBS\"
eval TCL_LIB_SPEC=\"$TCL_LIB_SPEC\"
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
# Check for Tk configuration script tkConfig.sh
@ -16594,12 +16589,12 @@ s,@XGETTEXT@,$XGETTEXT,;t t
s,@localedir@,$localedir,;t t
s,@TCLSH@,$TCLSH,;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_LIBS@,$TCL_LIBS,;t t
s,@TCL_LIB_SPEC@,$TCL_LIB_SPEC,;t t
s,@TCL_SHARED_BUILD@,$TCL_SHARED_BUILD,;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_LIBS@,$TK_LIBS,;t t
s,@TK_LIB_SPEC@,$TK_LIB_SPEC,;t t

11
configure.in
View File

@ -1,5 +1,5 @@
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 Developers, please strive to achieve this order:
dnl
@ -1077,15 +1077,8 @@ fi
if test "$with_tcl" = yes; then
PGAC_PATH_TCLCONFIGSH([$with_tclconfig])
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
# 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
# Check for Tk configuration script tkConfig.sh