From 7cc481c55bd065e42d43cdcd2cd9887eca598af9 Mon Sep 17 00:00:00 2001
From: Andrew Benton <andy@linuxfromscratch.org>
Date: Wed, 4 Jan 2006 14:09:11 +0000
Subject: [PATCH] Added a sentence about libao and a configure switch to
 compile against NAS-1.7 (thanks Tushar) to the Gaim page

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@5516 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent          |  2 +-
 xsoft/other/gaim.xml | 44 ++++++++++++++++++++++++++++++++++----------
 2 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/general.ent b/general.ent
index 39273a6ab1..5d7c295b81 100644
--- a/general.ent
+++ b/general.ent
@@ -1,4 +1,4 @@
-<!ENTITY day          "02">
+<!ENTITY day          "04">
 <!ENTITY month        "01">
 <!ENTITY year         "2006">
 <!ENTITY version      "svn-&year;&month;&day;">
diff --git a/xsoft/other/gaim.xml b/xsoft/other/gaim.xml
index 607910dd0c..5be3bcf0c2 100644
--- a/xsoft/other/gaim.xml
+++ b/xsoft/other/gaim.xml
@@ -33,8 +33,8 @@
   <sect2 role="package">
     <title>Introduction to Gaim</title>
 
-    <para><application>Gaim</application> is an instant messaging client that can
-    connect with a wide range of networks including AIM, ICQ, MSN, Jabber,
+    <para><application>Gaim</application> is an instant messaging client that
+    can connect with a wide range of networks including AIM, ICQ, MSN, Jabber,
     IRC, Napster, Gadu-Gadu, Zephyr and Yahoo!</para>
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -71,8 +71,13 @@
     <ulink url="ftp://ftp.gnutls.org/pub/gnutls/libtasn1/">libtasn1</ulink>,
     <ulink url="http://ftp.gnupg.org/gcrypt/gnutls/">gnutls</ulink>,
     <ulink url="http://gtkspell.sourceforge.net/">Gtkspell</ulink>
-    <xref linkend="tcl"/>, <xref linkend="tk"/>, <xref linkend="startup-notification"/>,
-    <xref linkend="audiofile"/>, <xref linkend="dbus"/>, <xref linkend="mitkrb"/>,
+    <xref linkend="tcl"/>,
+    <xref linkend="tk"/>,
+    <xref linkend="startup-notification"/>,
+    <xref linkend="audiofile"/>,
+    <xref linkend="dbus"/>,
+    <xref linkend="mitkrb"/>,
+    <xref linkend="nas"/>,
     <xref linkend="doxygen"/> and
     <ulink url="http://www.porchdogsoft.com/products/howl/download.html">Howl</ulink>
 
@@ -83,12 +88,15 @@
   <sect2 role="installation">
     <title>Installation of Gaim</title>
 
-    <para>To connect with MSN you will need to compile <application>Gaim</application>
-    with SSL support. For this you will need to have already installed
-    <application>libgpg-error</application>, <application>libgcrypt</application>,
-    <application>libtasn1</application> and <application>gnutls</application> compiled
-    in that order. Use of the <application>Mozilla</application> SSL library is
-    deprecated.</para>
+    <para>To connect with MSN you will need to compile
+    <application>Gaim</application> with SSL support. For this you will need to
+    have already installed <application>libgpg-error</application>,
+    <application>libgcrypt</application>, <application>libtasn1</application>
+    and <application>gnutls</application> compiled in that order. Use of the
+    <application>Mozilla</application> SSL library is deprecated.</para>
+
+    <para>To compile <application>Gaim</application> with audio support, first
+    install <xref linkend="libao"/>.</para>
 
     <para>Install <application>Gaim</application> by running the following
     commands:</para>
@@ -96,6 +104,13 @@
 <screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
+    <para>If you want to compile <application>Gaim</application> with support
+    for <xref linkend="nas"/>, configure it like this:</para>
+
+<screen><userinput>CPPFLAGS="-I/usr/X11R6/include" ./configure --prefix=/usr \
+    --enable-nas &amp;&amp;
+make</userinput></screen>
+
     <para>To test the results, issue: <command>make check</command>.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
@@ -104,6 +119,15 @@ make</userinput></screen>
 
   </sect2>
 
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><command>CPPFLAGS=...--enable-nas</command>:<xref linkend="nas"/>
+    Use this switch if you want to compile <application>Gaim</application>
+    with <xref linkend="nas"/> support.</para>
+
+  </sect2>
+
   <sect2 role="content">
     <title>Contents</title>