From eed7fc88c56c2cd0936f57275c93d36280197bcb Mon Sep 17 00:00:00 2001
From: Randy McMurchy <randy@linuxfromscratch.org>
Date: Fri, 10 Sep 2004 20:38:09 +0000
Subject: [PATCH] Added an optional dependency and a note about a build problem
 to the libsoup instructions

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@2734 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 basicnet/netlibs/libsoup.xml       | 16 +++++++++++++---
 introduction/welcome/changelog.xml |  3 ++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/basicnet/netlibs/libsoup.xml b/basicnet/netlibs/libsoup.xml
index e299a8bddf..8f8943d5a3 100644
--- a/basicnet/netlibs/libsoup.xml
+++ b/basicnet/netlibs/libsoup.xml
@@ -2,7 +2,7 @@
    "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
- 
+
   <!ENTITY libsoup-download-http "http://ftp.gnome.org/pub/gnome/sources/libsoup/1.99/libsoup-&libsoup-version;.tar.bz2">
   <!ENTITY libsoup-download-ftp  "ftp://ftp.gnome.org/pub/gnome/sources/libsoup/1.99/libsoup-&libsoup-version;.tar.bz2">
   <!ENTITY libsoup-size          "365 KB">
@@ -43,7 +43,8 @@
 </para></sect4>
 <sect4><title>Optional</title>
 <para>
-<xref linkend="gtk-doc"/> and 
+<xref linkend="gtk-doc"/>, 
+<xref linkend="docbook-utils"/> and 
 <ulink url="http://www.gnu.org/software/gnutls/">GnuTLS</ulink> (which
 needs <ulink
 url="ftp://ftp.gnupg.org/gcrypt/alpha/libgpg-error/">libgpg-error</ulink>,
@@ -59,12 +60,21 @@ in that order.)
 <sect2>
 <title>Installation of <application>libsoup</application></title>
 
-<para>Install <application>libsoup</application> by running the following commands:</para>
+<para>Install <application>libsoup</application> by running the following 
+commands:</para>
 
 <screen><userinput><command>./configure --prefix=/usr --libexecdir=/usr/sbin &amp;&amp;
 make &amp;&amp;
 make install</command></userinput></screen>
 
+<note><para>Some versions of <application>GnuTLS</application> will cause the 
+<application>libsoup</application> build to fail. You can use the following
+<command>sed</command> command before the build to fix this problem.</para>
+</note>
+
+<screen><userinput><command>sed -i -e "s@status \&amp; GNUTLS_CERT_CORRUPTED ||@/* status \&amp; GNUTLS_CERT_CORRUPTED || */@" \
+    libsoup/soup-gnutls.c</command></userinput></screen>
+
 </sect2>
 
 <sect2>
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 2e40437d68..d7d2d393ed 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -24,7 +24,8 @@ who wrote what.</para>
 
 <listitem><para>September 10th, 2004 [randy]: Corrected OpenSP instructions  
 to fix hard-coded version (replaced with version entity) as suggested by
-Nico Roeser.</para></listitem>
+Nico Roeser; added optional dependencies and a note to fix a build problem
+to the libsoup instructions.</para></listitem>
 
 <listitem><para>September 10th, 2004 [randy]: Added gcc34 patch to 
 GNOME-Terminal to fix an LFS-6.0 build problem; added required