added make -j warning, Mesa info

1 files changed, 34 insertions, 13 deletions

diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/DRIcomp.sgml b/xc/programs/Xserver/hw/xfree86/doc/sgml/DRIcomp.sgml
index 436dddd9a..2ab86b366 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/DRIcomp.sgml
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/DRIcomp.sgml
@@ -1,7 +1,7 @@
 <!doctype linuxdoc system>
 <!-- Created: Sun Mar 12 13:00:00 2000 by brian@precisioninsight.com -->
 <!-- Revised: Fri May 19 09:36:02 2000 by martin@valinux.com -->
-<!-- $Id: DRIcomp.sgml,v 1.12 2000/06/14 19:31:40 keithw Exp $ -->
+<!-- $Id: DRIcomp.sgml,v 1.13 2000/08/08 16:59:18 brianp Exp $ -->
 
   <article>
 
@@ -9,7 +9,7 @@
       <author>
           <htmlurl url="http://www.precisioninsight.com/"
             name="Precision Insight, Inc.">
-      <date>18 May 2000
+      <date>8 August 2000
         
     <ident>
     $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DRI.sgml,v 1.3 2000/04/05 05:38:41 brianp Exp $
@@ -257,19 +257,36 @@
         </enum>
 
 
-    <sect>Updating your CVS sources
-      <p>
-        In the future you'll want to occasionally update your local copy of
-        the DRI source code to get the latest changes.
-        This can be done with:
-        <verb>
-            cd ~/DRI-CVS
-            cvs -z3 update -dA xc
-        </verb>
-        The -d flag causes any new subdirectories to be created and -A causes
-        most recent trunc sources to be fetched, not branch sources.
+      <sect1>Updating your CVS sources
+	<p>
+	  In the future you'll want to occasionally update your local copy of
+	  the DRI source code to get the latest changes.
+	  This can be done with:
+	  <verb>
+	      cd ~/DRI-CVS
+	      cvs -z3 update -dA xc
+	  </verb>
+	  The -d flag causes any new subdirectories to be created and -A causes
+	  most recent trunc sources to be fetched, not branch sources.
 
 
+    <sect>Mesa
+      <p>
+        Most of the DRI 3D drivers are based on Mesa (the free implmentation
+        of the OpenGL API).
+        The relevant files from Mesa are already included in the XFree86/DRI
+        source tree.
+        <em>There is no need to download or install the Mesa source files
+        separately.</em>
+      <p>
+        Sometimes a newer version of Mesa will be available than the version
+        included in XFree86/DRI.
+        Upgrading Mesa within XFree86/DRI is not always straightforward.
+        It can be an error-prone undertaking, especially for beginners, and is
+        not generally recommended.
+        The DRI developers will upgrade Mesa when appropriate.
+      <p>
+
     <sect>Compiling the XFree86/DRI tree
       <sect1>Make a build tree
         <p>
@@ -353,6 +370,10 @@
         <p>
           Building will take some time so you may want to go check your
           email or visit slashdot.
+        <p>
+	  <em>WARNING:</em> do not use the -j option with make.
+          It's reported that it does not work with XFree86/DRI.
+        <p>
 
       <sect1>Check for compilation errors
         <p>