1 files changed, 74 insertions, 8 deletions
diff --git a/chapter05/expect.xml b/chapter05/expect.xml
index 11887dfd2..5d99eaf4d 100644
--- a/chapter05/expect.xml
+++ b/chapter05/expect.xml
@@ -3,13 +3,15 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-tools-expect" xreflabel="Expect" role="wrap">
+<sect1 id="ch-tools-expect" role="wrap">
 <title>Expect-&expect-version;</title>
 <?dbhtml filename="expect.html"?>
 
 <indexterm zone="ch-tools-expect"><primary sortas="a-Expect">Expect</primary></indexterm>
 
 <sect2 role="package"><title/>
+<para>The Expect package contains a program for carrying out scripted dialogues
+with other interactive programs.</para>
 
 <segmentedlist>
 <segtitle>&buildtime;</segtitle>
@@ -17,12 +19,18 @@
 <seglistitem><seg>0.1 SBU</seg><seg>3.9 MB</seg></seglistitem>
 </segmentedlist>
 
+<segmentedlist>
+<segtitle>Expect installation depends on</segtitle>
+<seglistitem><seg>Bash, Binutils, Coreutils, Diffutils,
+GCC, Glibc, Grep, Make, Sed, and Tcl</seg></seglistitem>
+</segmentedlist>
 </sect2>
 
 <sect2 role="installation">
 <title>Installation of Expect</title>
 
-<para>Apply a patch:</para>
+<para>First, fix a bug that can result in false failures during the GCC test
+suite run:</para>
 
 <screen><userinput>patch -Np1 -i ../expect-&expect-version;-spawn-1.patch</userinput></screen>
 
@@ -30,26 +38,84 @@
 
 <screen><userinput>./configure --prefix=/tools --with-tcl=/tools/lib --with-x=no</userinput></screen>
 
+<para>The meaning of the configure options:</para>
+
+<variablelist>
+<varlistentry>
+<term><parameter>--with-tcl=/tools/lib</parameter></term>
+<listitem><para>This ensures that the configure script finds the Tcl installation in
+the temporary tools location instead of possibly locating an existing
+one on the host system.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><parameter>--with-x=no</parameter></term>
+<listitem><para>This tells the configure script not to search for Tk
+(the Tcl GUI component) or the X Window System libraries, both of
+which may reside on the host system.</para></listitem>
+</varlistentry>
+</variablelist>
+
 <para>Build the package:</para>
 
 <screen><userinput>make</userinput></screen>
 
-<para>To test the results, issue:
-<userinput>make test</userinput></para>
+<para>To test the results, issue: <userinput>make test</userinput>.
+Note that the Expect test suite is known to experience failures under
+certain host conditions that are not within our control. Therefore,
+test suite failures here are not surprising and are not considered
+critical.</para>
 
-<para>And install it:</para>
+<para>Install the package:</para>
 
 <screen><userinput>make SCRIPTS="" install</userinput></screen>
 
-<para>You can now remove the source directories of both Tcl and Expect.</para>
+<para>The meaning of the make parameter:</para>
+
+<variablelist>
+<varlistentry>
+<term><parameter>SCRIPTS=""</parameter></term>
+<listitem><para>This prevents installation of the supplementary expect
+scripts, which are not needed.</para></listitem>
+</varlistentry>
+</variablelist>
+
+<para>The source directories of both Tcl and Expect can now be removed.</para>
 
 </sect2>
 
 <sect2 id="contents-expect" role="content"><title>Contents of Expect</title>
 
-<para>See testing</para>
+<segmentedlist>
+<segtitle>Installed program</segtitle>
+<segtitle>Installed library</segtitle>
+<seglistitem><seg>expect</seg><seg>libexpect-5.42.a</seg></seglistitem>
+</segmentedlist>
+
+<variablelist><bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
+
+<varlistentry id="expect">
+<term><command>expect</command></term>
+<listitem>
+<para>Communicates with other interactive
+programs according to a script</para>
+<indexterm zone="ch-tools-expect expect"><primary sortas="b-expect">expect</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="libexpect">
+<term><filename class="libraryfile">libexpect-5.42.a</filename></term>
+<listitem>
+<para>Contains functions that allow Expect to be used as a Tcl extension or to
+be used directly from C or C++ (without Tcl)</para>
+<indexterm zone="ch-tools-expect libexpect"><primary
+sortas="c-libexpect-5.42">libexpect-5.42</primary></indexterm>
+</listitem>
+</varlistentry>
+</variablelist>
 
 </sect2>
 
-
 </sect1>
+