r8220 - in trunk/BOOK: . introduction/welcome x/installing

dj at linuxfromscratch.org dj at linuxfromscratch.org
Mon Jan 25 16:41:28 PST 2010


Author: dj
Date: 2010-01-25 17:41:28 -0700 (Mon, 25 Jan 2010)
New Revision: 8220

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/x/installing/x7lib.xml
Log:
Corrected Xorg Libraries optional dependencies.

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2010-01-19 12:15:41 UTC (rev 8219)
+++ trunk/BOOK/general.ent	2010-01-26 00:41:28 UTC (rev 8220)
@@ -3,7 +3,7 @@
 $Date$
 -->
 
-<!ENTITY day          "19">                   <!-- Always 2 digits -->
+<!ENTITY day          "25">                   <!-- Always 2 digits -->
 <!ENTITY month        "01">                   <!-- Always 2 digits -->
 <!ENTITY year         "2010">
 <!ENTITY copyrightdate "2001-&year;">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2010-01-19 12:15:41 UTC (rev 8219)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2010-01-26 00:41:28 UTC (rev 8220)
@@ -42,6 +42,15 @@
 -->
 
     <listitem>
+      <para>January 25th, 2010</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Updated Xorg library dependencies.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>January 19th, 2010</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/x/installing/x7lib.xml
===================================================================
--- trunk/BOOK/x/installing/x7lib.xml	2010-01-19 12:15:41 UTC (rev 8219)
+++ trunk/BOOK/x/installing/x7lib.xml	2010-01-26 00:41:28 UTC (rev 8220)
@@ -73,7 +73,11 @@
     <xref linkend="libXdmcp"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="libxcb"/></para>
+    <para role="optional"><xref linkend="libxcb"/> (a modern Xlib replacement)
+    and <xref linkend="xmlto"/> with one or more of the following:
+    <xref linkend="fop"/>, <xref linkend="Links"/>, <xref linkend="lynx"/>,
+    and <xref linkend="w3m"/> (to generate additional PDF or text
+    documentation for the libXfont package).</para>
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url='&blfs-wiki;/Xorg7Libraries'/></para>
@@ -100,7 +104,17 @@
     <para>Install the libraries by running the following commands for each
     package:</para>
 
-<screen><userinput>./configure $XORG_CONFIG &&
+<screen><userinput>case $(basename "$PWD") in
+libXfont-[0-9]* )
+                 ./configure $XORG_CONFIG --disable-devel-docs
+                 ;;
+  libX11-[0-9]* )
+                 ./configure $XORG_CONFIG --without-xcb
+                 ;;
+              * )
+                 ./configure $XORG_CONFIG
+                 ;;
+esac &&
 make</userinput></screen>
 
     <para>These packages do not provide test suites.</para>
@@ -118,10 +132,17 @@
 
     <para><parameter>--without-xcb</parameter>: By default,
     <application>libX11</application> will use <xref linkend="libxcb"/>
-    for its transport layer. This parameter is necessary in the
-    <command>./configure</command> command if <xref linkend="libxcb"/>
-    is not installed.</para>
+    for its transport layer. Omit this parameter (or the <command>case</command>
+    statement) if you've installed <xref linkend="libxcb"/>.</para>
 
+    <para><parameter>--with-fop</parameter>: Use <xref linkend="fop"/> to
+    generate PDF documentation (only for the libXfont package).</para>
+
+    <para><parameter>--disable-devel-docs</parameter>: Diable generation of
+    text documentation in the libXfont package if
+    <xref linkend="xmlto"/> is installed without a text browser. Omit
+    this parameter (or the entire <command>case</command> statement) if a text
+    browser is installed.</para>
   </sect2>
 
   <sect2 role="configuration">




More information about the blfs-book mailing list