xserver: Branch 'master'

[Luc Verhaegen]

 glx/Makefile.am |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 398cdf959afadfa964aece13cc9d89b2dd589930
Author: Luc Verhaegen <libv at skynet.be>
Date:   Wed Oct 15 18:24:10 2008 +0200

    GLX: fix build when dri2 is not available.

diff --git a/glx/Makefile.am b/glx/Makefile.am
index 4f723ac..f9a3178 100644
--- a/glx/Makefile.am
+++ b/glx/Makefile.am
@@ -22,9 +22,12 @@ INCLUDES = \
 	-I$(top_srcdir)/hw/xfree86/os-support/bus \
 	-I$(top_srcdir)/hw/xfree86/common \
 	-I$(top_srcdir)/hw/xfree86/dri \
-	-I$(top_srcdir)/hw/xfree86/dri2 \
 	-I$(top_srcdir)/mi
 
+if DRI2
+INCLUDES += -I$(top_srcdir)/hw/xfree86/dri2
+endif
+
 glapi_sources =					\
 	indirect_dispatch.c			\
 	indirect_dispatch.h			\
@@ -47,10 +50,13 @@ glapi_sources =					\
 
 libglxdri_la_SOURCES = \
         glxdri.c \
-        glxdri2.c \
         extension_string.c \
         extension_string.h
 
+if DRI2
+libglxdri_la_SOURCES = glxdri2.c
+endif
+
 libglx_la_SOURCES = \
 	$(indirect_sources) \
 	$(glapi_sources) \