xserver: Branch 'master'

[Luc Verhaegen]

 glx/Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0195d318465d5a6a9039091bcb252202471df5a4
Author: Luc Verhaegen <libv at skynet.be>
Date:   Wed Oct 15 21:46:27 2008 +0200

    GLX: fix build when dri2 _is_ available.
    
    Caught by Julien Cristau.

diff --git a/glx/Makefile.am b/glx/Makefile.am
index f9a3178..8c705a7 100644
--- a/glx/Makefile.am
+++ b/glx/Makefile.am
@@ -54,7 +54,7 @@ libglxdri_la_SOURCES = \
         extension_string.h
 
 if DRI2
-libglxdri_la_SOURCES = glxdri2.c
+libglxdri_la_SOURCES += glxdri2.c
 endif
 
 libglx_la_SOURCES = \