xserver: Branch 'master'

[Julien Cristau]

 hw/kdrive/src/Makefile.am |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit b622f6dc5d8d70d17be0374a85a9b16b43a62a01
Author: Julien Cristau <jcristau at debian.org>
Date:   Mon Jun 23 23:45:57 2008 +0200

    kdrive: fix building with --disable-xv (bug#16488)

diff --git a/hw/kdrive/src/Makefile.am b/hw/kdrive/src/Makefile.am
index 07ab8c8..29098c3 100644
--- a/hw/kdrive/src/Makefile.am
+++ b/hw/kdrive/src/Makefile.am
@@ -12,6 +12,12 @@ KDRIVE_HW_SOURCES =	\
 	vga.h
 endif
 
+if XV
+KDRIVE_XV_SOURCES =	\
+	kxv.c		\
+	kxv.h
+endif
+
 libkdrive_a_SOURCES =	\
 	fourcc.h	\
 	kaa.c		\
@@ -31,8 +37,7 @@ libkdrive_a_SOURCES =	\
 	koffscreen.c	\
 	kshadow.c	\
 	ktest.c		\
-	kxv.c		\
-	kxv.h		\
+	$(KDRIVE_XV_SOURCES) \
 	$(KDRIVE_HW_SOURCES) \
         $(top_srcdir)/mi/miinitext.c