From 62c35b309860bcbae261ccf1091af4785c2d5c29 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Tue, 11 Feb 2003 21:05:35 +0000
Subject: [PATCH] Simplify evaluation of TCL_INCLUDE_SPEC.

---
 configure    |  9 ++-------
 configure.in | 11 ++---------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/configure b/configure
index 2ee8febe84..6a68d7e141 100755
--- a/configure
+++ b/configure
@@ -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
diff --git a/configure.in b/configure.in
index 2b5336818b..791beb3989 100644
--- a/configure.in
+++ b/configure.in
@@ -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