Merge branch 'mesa_7_7_branch'

[mesa.git] / docs / autoconf.html

diff --git a/docs/autoconf.html b/docs/autoconf.html
index 964ff140abc7e5a642b40403521e3c6e8bcd096d..936ddcffebb49d4230af2e9026cb79ac6e4e5a69 100644 (file)
--- a/docs/autoconf.html
+++ b/docs/autoconf.html
@@ -43,9 +43,12 @@ configure script, type:
 <p>
 To see a short description of all the options, type <code>./configure
 --help</code>. If you are using a development snapshot and the configure
-script does not exist, type <code>make configure</code> to generate it
-first. Once you have run <code>./configure</code> and set the options to
-your preference, type:
+script does not exist, type <code>./autogen.sh</code> to generate it
+first. If you know the options you want to pass to
+<code>configure</code>, you can pass them to <code>autogen.sh</code>. It
+will run <code>configure</code> with these options after it is
+generated. Once you have run <code>configure</code> and set the options
+to your preference, type:
 </p>
 
 <pre>
@@ -116,6 +119,12 @@ be used. In this case, the <code>--with-x</code>,
 <code>--x-includes</code> and <code>--x-libraries</code> options can
 control the use of X for Mesa.
 </li>
+<li><code>--enable-gl-osmesa</code> - The <a href="osmesa.html">OSMesa
+library</a> can be built on top of libGL for drivers that provide it.
+This option controls whether to build libOSMesa. By default, this is
+enabled for the Xlib driver and disabled otherwise. Note that this
+option is different than using OSMesa as the driver.
+</li>
 <li><code>--enable-debug</code> - This option will enable compiler
 options and macros to aid in debugging the Mesa libraries.
 </li>
@@ -156,16 +165,6 @@ libraries, as well as the X11 development headers, will be need to
 support the Xlib driver.
 </li>
 
-<!-- Xlib specific options -->
-<p>
-<ul>
-<li><code>--disable-xlib-osmesa</code> - By default, the OSMesa library
-will be built and linked to the Xlib enabled libGL. This option disables
-building of libOSMesa.
-</li>
-</ul>
-</p>
-
 <a name="dri">
 <li><b><em>DRI</em></b> - This mode uses the DRI hardware drivers for
 accelerated OpenGL rendering. Enable the DRI drivers with the option
@@ -179,16 +178,16 @@ drivers.
 <ul>
 <li><code>--with-dri-driverdir=DIR</code> - This option specifies the
 location the DRI drivers will be installed to and the location libGL
-will search for DRI drivers. The default is
-<code>/usr/X11R6/lib/modules/dri</code>.
+will search for DRI drivers. The default is <code>${libdir}/dri</code>.
 </li>
 <li><code>--with-dri-drivers=DRIVER,DRIVER,...</code> - This option
 allows a specific set of DRI drivers to be built. For example,
-<code>--with-dri-drivers="i965,radeon,nouveau"</code>. By default,
-the drivers will be chosen depending on the target platform. See the
-directory <code>src/mesa/drivers/dri</code> in the source tree for
-available drivers.
-</li>
+<code>--with-dri-drivers="swrast,i965,radeon,nouveau"</code>. By
+default, the drivers will be chosen depending on the target platform.
+See the directory <code>src/mesa/drivers/dri</code> in the source tree
+for available drivers. Beware that the swrast DRI driver is used by both
+libGL and the X.Org xserver GLX module to do software rendering, so you
+may run into problems if it is not available.</li>
 <!-- This explanation might be totally bogus. Kristian? -->
 <li><code>--disable-driglx-direct</code> - Disable direct rendering in
 GLX. Normally, direct hardware rendering through the DRI drivers and