xserver: Branch 'server-1.5-branch'

[Alan Hourihane]

 glx/Makefile.am |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit af8cef461c4d107f7a03645568a635d0458da9b8
Author: Alan Hourihane <alanh at tungstengraphics.com>
Date:   Wed Sep 24 14:24:36 2008 +0100

    only build dri2 when DRI2 is enabled

diff --git a/glx/Makefile.am b/glx/Makefile.am
index 39b96d7..0214295 100644
--- a/glx/Makefile.am
+++ b/glx/Makefile.am
@@ -45,9 +45,13 @@ glapi_sources =					\
 	glthread.h				\
 	glprocs.h
 
+if DRI2
+GLXDRI_SOURCE = glxdri2.c
+endif
+
 libglxdri_la_SOURCES = \
         glxdri.c \
-        glxdri2.c \
+	$(GLXDRI2_SOURCE) \
 	glxdricommon.h \
         extension_string.c \
         extension_string.h