From 19711e7023d42b3eaf00f0d6461d3c67e652f697 Mon Sep 17 00:00:00 2001
From: Jeremy Huntwork <jhuntwork@linuxfromscratch.org>
Date: Sat, 25 Jun 2005 11:24:19 +0000
Subject: [PATCH] Added --with-tclinclude flag to Expect. (merged from trunk
 r6134, r6135 & r6140)

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/6.1/BOOK@6160 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml |  3 +++
 chapter05/expect.xml    | 15 ++++++++++++++-
 chapter05/tcl.xml       |  6 ++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index ceb0ae6c2..9e9869006 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -87,6 +87,9 @@ First a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>June 25th, 2005 [jhuntwork]: Added a --with-tclinclude flag to
+Expect build to ensure that it knows where to find the Tcl source directory.</para></listitem>
+
 <listitem><para>June 25th, 2005 [matthew]: Updated to the latest version of the
 mktemp tempfile patch, which supports building outside the source directory</para></listitem>
 
diff --git a/chapter05/expect.xml b/chapter05/expect.xml
index 5445f6032..ee2155b2f 100644
--- a/chapter05/expect.xml
+++ b/chapter05/expect.xml
@@ -36,7 +36,8 @@ suite run:</para>
 
 <para>Now prepare Expect for compilation:</para>
 
-<screen><userinput>./configure --prefix=/tools --with-tcl=/tools/lib --with-x=no</userinput></screen>
+<screen><userinput>./configure --prefix=/tools --with-tcl=/tools/lib \
+   --with-tclinclude=$TCLPATH --with-x=no</userinput></screen>
 
 <para>The meaning of the configure options:</para>
 
@@ -48,6 +49,14 @@ the temporary tools location instead of possibly locating an existing
 one on the host system.</para></listitem>
 </varlistentry>
 
+<varlistentry>
+<term><parameter>--with-tclinclude=$TCLPATH</parameter></term>
+<listitem><para>This explicitly tells Expect where to find Tcl's source
+directory and internal headers. Using this option avoids conditions
+where <command>configure</command> fails because it hasn't automatically
+discovered the location of the Tcl source directory.</para></listitem>
+</varlistentry>
+
 <varlistentry>
 <term><parameter>--with-x=no</parameter></term>
 <listitem><para>This tells the configure script not to search for Tk
@@ -80,6 +89,10 @@ scripts, which are not needed.</para></listitem>
 </varlistentry>
 </variablelist>
 
+<para>Now remove the TCLPATH variable:</para>
+
+<screen><userinput>unset TCLPATH</userinput></screen>
+
 <para>The source directories of both Tcl and Expect can now be removed.</para>
 
 <beginpage/>
diff --git a/chapter05/tcl.xml b/chapter05/tcl.xml
index c95b864fd..a12220121 100644
--- a/chapter05/tcl.xml
+++ b/chapter05/tcl.xml
@@ -66,6 +66,12 @@ Details on the <envar>TZ</envar> environment variable is provided in
 <filename class="directory">tcl&tcl-version;</filename> source directory yet, as the next package
 will need its internal headers.</para></warning>
 
+<para>Set a variable containing the full path of the current directory.
+The next package, Expect, will use this variable to find Tcl's headers.</para>
+
+<screen><userinput>cd ..
+export TCLPATH=`pwd`</userinput></screen>
+
 <para>Now make a necessary symbolic link:</para>
 
 <screen><userinput>ln -s tclsh8.4 /tools/bin/tclsh</userinput></screen>