fontconfig mesa pixman git update 11 Sep 2013

xserver          commit 47ff382d1fce25a8b097d45b79489e891f1f1228
libxcb           commit f1405d9fe4a6ddcae24585ba254389a4c4f4c8c9
libxcb/xcb-proto commit bd7708ac1037e647b094fa7440ebb6171b9bc75f
xkeyboard-config commit c2309b50e7ef7b9263278fd8ff73dda1484d72db
libX11           commit cb107760df33ffc8630677e66e2e50aa37950a5c
libXdmcp         commit 66514a4af7eaa47e8718434356d7efce95e570cf
libXext          commit 7378d4bdbd33ed49ed6cfa5c4f73d7527982aab4
libfontenc       commit 3acba630d8b57084f7e92c15732408711ed5137a
libXinerama      commit 6e1d1dc328ba8162bba2f4694e7f3c706a1491ff
libXau           commit 899790011304c4029e15abf410e49ce7cec17e0a
xkbcomp          commit 24d18e0a844041ef82441adb16aa18cc4b4814ae
pixman           commit a4c79d695d52c94647b1aff78548e5892d616b70
xextproto        commit f27fcc99d1cf935cc289933326f7d3baacd5107a
randrproto       commit ca7cc541c2e43e6c784df19b4583ac35829d2f72
glproto          commit 8e3407e02980d088e20041e79bdcdd3737e7827e
mkfontscale      commit f48de13423c7300f4da9f61993b624426b38ddc0
xwininfo         commit ba0d1b0da21d2dbdd81098ed5778f3792b472e13
libXft           commit c5e760a239afc62a1c75e0509868e35957c8df52
libXmu           commit 2539e539eafdac88177c8ee30b043c5d52f017e4
libxtrans        commit f6a161f2a003f4da0a2e414b4faa0ee0de0c01f0
fontconfig       commit 7e44a0b5a88e597b33ba9e2cc3a6d4555736db0a
mesa             commit b217d48364f368f541e53006af5dd56f664be24d

1 files changed, 10 insertions, 27 deletions

diff --git a/mesalib/docs/autoconf.html b/mesalib/docs/autoconf.html
index a07a3ee14..d4e8a35d8 100644
--- a/mesalib/docs/autoconf.html
+++ b/mesalib/docs/autoconf.html
@@ -123,24 +123,6 @@ directories.</p>
 There are also a few general options for altering the Mesa build:
 </p>
 <dl>
-<dt><code>--with-x</code></dt>
-<dd><p>When the X11 development libraries are
-needed, the <code>pkg-config</code> utility <a href="#pkg-config">will
-be used</a> for locating them. If they cannot be found through
-<code>pkg-config</code> a fallback routing using <code>imake</code> will
-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.</p>
-</dd>
-
-<dt><code>--enable-gl-osmesa</code></dt>
-<dd><p>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.</p>
-</dd>
-
 <dt><code>--enable-debug</code></dt>
 <dd><p>This option will enable compiler
 options and macros to aid in debugging the Mesa libraries.</p>
@@ -155,12 +137,12 @@ assembly will not be used.</p>
 
 <dt><code>--enable-32-bit</code></dt>
 <dt><code>--enable-64-bit</code></dt>
-<dd><p>By default, the
-build will compile code as directed by the environment variables
+<dd><p>By default, the build will compile code as directed by the environment
+variables
 <code>CC</code>, <code>CFLAGS</code>, etc. If the compiler is
 <code>gcc</code>, these options offer a helper to add the compiler flags
 to force 32- or 64-bit code generation as used on the x86 and x86_64
-architectures.</p>
+architectures. Note that these options are mutually exclusive.</p>
 </dd>
 </dl>
 
@@ -171,19 +153,19 @@ architectures.</p>
 There are several different driver modes that Mesa can use. These are
 described in more detail in the <a href="install.html">basic
 installation instructions</a>. The Mesa driver is controlled through the
-configure option --with-driver. There are currently three supported
-options in the configure script.
+configure options <code>--enable-xlib-glx</code>, <code>--enable-osmesa</code>,
+and <code>--enable-dri</code>.
 </p>
 
-<h3 id="xlib">Xlib</h3><p>This is the default mode for building Mesa.
+<h3 id="xlib">Xlib</h3><p>
 It uses Xlib as a software renderer to do all rendering. It corresponds
-to the option <code>--with-driver=xlib</code>. The libX11 and libXext
+to the option <code>--enable-xlib-glx</code>. The libX11 and libXext
 libraries, as well as the X11 development headers, will be need to
 support the Xlib driver.
 
 <h3 id="dri">DRI</h3><p>This mode uses the DRI hardware drivers for
 accelerated OpenGL rendering. Enable the DRI drivers with the option
-<code>--with-driver=dri</code>. See the <a href="install.html">basic
+<code>--enable-dri</code>. See the <a href="install.html">basic
 installation instructions</a> for details on prerequisites for the DRI
 drivers.
 
@@ -223,7 +205,8 @@ and <code>/usr/local/lib</code>, respectively.
 <h3 id="osmesa">OSMesa </h3><p> No libGL is built in this
 mode. Instead, the driver code is built into the Off-Screen Mesa
 (OSMesa) library. See the <a href="osmesa.html">Off-Screen Rendering</a>
-page for more details.
+page for more details.  It corresponds to the option
+<code>--enable-osmesa</code>.
 
 <!-- OSMesa specific options -->
 <dl>