diff -ur xorg-server-1.4.2.org/hw/kdrive/src/Makefile.am xorg-server-1.4.2/hw/kdrive/src/Makefile.am
--- xorg-server-1.4.2.org/hw/kdrive/src/Makefile.am	2008-06-10 19:57:19.000000000 +0200
+++ xorg-server-1.4.2/hw/kdrive/src/Makefile.am	2008-06-23 22:18:31.000000000 +0200
@@ -6,6 +6,12 @@
 
 noinst_LIBRARIES = libkdrive.a libkdrivestubs.a
 
+if XV
+XV_SOURCES =	\
+	kxv.c		\
+	kxv.h
+endif
+
 if KDRIVE_HW
 KDRIVE_HW_SOURCES =	\
 	vga.c		\
@@ -31,8 +37,7 @@
 	koffscreen.c	\
 	kshadow.c	\
 	ktest.c		\
-	kxv.c		\
-	kxv.h		\
+	$(XV_SOURCES) \
 	$(KDRIVE_HW_SOURCES) \
         $(top_srcdir)/mi/miinitext.c
 
diff -ur xorg-server-1.4.2.org/hw/kdrive/src/Makefile.in xorg-server-1.4.2/hw/kdrive/src/Makefile.in
--- xorg-server-1.4.2.org/hw/kdrive/src/Makefile.in	2008-06-11 16:31:16.000000000 +0200
+++ xorg-server-1.4.2/hw/kdrive/src/Makefile.in	2008-06-23 22:18:31.000000000 +0200
@@ -56,14 +56,14 @@
 am__libkdrive_a_SOURCES_DIST = fourcc.h kaa.c kaa.h kaapict.c kasync.c \
 	kcmap.c kcurscol.c kdrive.c kdrive.h kinfo.c kinput.c \
 	kkeymap.c kmap.c kmode.c knoop.c koffscreen.c kshadow.c \
-	ktest.c kxv.c kxv.h vga.c vga.h $(top_srcdir)/mi/miinitext.c
+	ktest.c vga.c vga.h $(top_srcdir)/mi/miinitext.c
 @KDRIVE_HW_TRUE@am__objects_1 = vga.$(OBJEXT)
 am_libkdrive_a_OBJECTS = kaa.$(OBJEXT) kaapict.$(OBJEXT) \
 	kasync.$(OBJEXT) kcmap.$(OBJEXT) kcurscol.$(OBJEXT) \
 	kdrive.$(OBJEXT) kinfo.$(OBJEXT) kinput.$(OBJEXT) \
 	kkeymap.$(OBJEXT) kmap.$(OBJEXT) kmode.$(OBJEXT) \
 	knoop.$(OBJEXT) koffscreen.$(OBJEXT) kshadow.$(OBJEXT) \
-	ktest.$(OBJEXT) kxv.$(OBJEXT) $(am__objects_1) \
+	ktest.$(OBJEXT) $(am__objects_1) \
 	miinitext.$(OBJEXT)
 libkdrive_a_OBJECTS = $(am_libkdrive_a_OBJECTS)
 libkdrivestubs_a_AR = $(AR) $(ARFLAGS)
@@ -382,6 +382,9 @@
 
 AM_CFLAGS = -DHAVE_DIX_CONFIG_H
 noinst_LIBRARIES = libkdrive.a libkdrivestubs.a
+@XV_TRUE@XV_SOURCES = \
+@XV_TRUE@	kxv.c		\
+@XV_TRUE@	kxv.h
 @KDRIVE_HW_TRUE@KDRIVE_HW_SOURCES = \
 @KDRIVE_HW_TRUE@	vga.c		\
 @KDRIVE_HW_TRUE@	vga.h
@@ -405,8 +408,7 @@
 	koffscreen.c	\
 	kshadow.c	\
 	ktest.c		\
-	kxv.c		\
-	kxv.h		\
+	$(XV_SOURCES) \
 	$(KDRIVE_HW_SOURCES) \
         $(top_srcdir)/mi/miinitext.c
 
@@ -480,7 +482,6 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/koffscreen.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kshadow.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ktest.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kxv.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/miinitext.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vga.Po@am__quote@