mesa: Branch 'master'

[Jeremy Kolb]

 configs/linux-dri-xcb |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

New commits:
diff-tree 838a2a2633e0f39000afea740c87ebce7cb0c4e7 (from e7e5279fc06da96c7018855b5933b144caee24ab)
Author: Jeremy Kolb <jkolb at brandeis.edu>
Date:   Fri Apr 20 21:53:38 2007 -0400

    Make xcb backend compile.
    Add nouveau to match linux-dri config.

diff --git a/configs/linux-dri-xcb b/configs/linux-dri-xcb
index cb327fa..5620fe5 100644
--- a/configs/linux-dri-xcb
+++ b/configs/linux-dri-xcb
@@ -22,7 +22,8 @@ ARCH_FLAGS ?=
 DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
 	-D_BSD_SOURCE -D_GNU_SOURCE \
 	-DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
-	-DGLX_DIRECT_RENDERING -DHAVE_ALIAS -DUSE_XCB -DHAVE_POSIX_MEMALIGN
+	-DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \
+        -DHAVE_ALIAS -DUSE_XCB -DHAVE_POSIX_MEMALIGN
 
 X11_INCLUDES = `pkg-config --cflags-only-I x11` `pkg-config --cflags-only-I xcb` `pkg-config --cflags-only-I x11-xcb` `pkg-config --cflags-only-I xcb-glx`
 
@@ -65,4 +66,4 @@ WINDOW_SYSTEM=dri
 # gamma are missing because they have not been converted to use the new
 # interface.
 DRI_DIRS = i810 i915 mach64 mga r128 r200 r300 radeon s3v \
-	savage sis tdfx trident unichrome ffb
+	savage sis tdfx trident unichrome ffb nouveau