Add some configure options, make the mach64 server build

hw/kdrive/Makefile.am

@@ -2,3 +2,4 @@ SUBDIRS =	\
 	src	\
 	linux	\
 	vesa	\
+	mach64

hw/kdrive/mach64/mach64draw.c

@@ -29,7 +29,7 @@
 #include "mach64.h"
 #include "mach64draw.h"
 
-#include	"Xmd.h"
+#include	<X11/Xmd.h>
 #include	"gcstruct.h"
 #include	"scrnintstr.h"
 #include	"pixmapstr.h"

hw/kdrive/mach64/mach64video.c

@@ -25,8 +25,8 @@
 #endif
 #include "mach64.h"
 
-#include "Xv.h"
-#include "../../xfree86/common/fourcc.h"
+#include <X11/extensions/Xv.h>
+#include "fourcc.h"
 
 #define MAKE_ATOM(a) MakeAtom(a, sizeof(a) - 1, TRUE)
 

hw/kdrive/vesa/Makefile.am

@@ -11,14 +11,19 @@ INCLUDES = 					\
 
 bin_PROGRAMS = Xvesa
 
-Xvesa_SOURCES = \
+noinst_LTLIBRARIES = libvesa.la
+
+libvesa_la_SOURCES = \
 	vesa.c		\
-	vesainit.c	\
 	vbe.c		\
 	vga.c		\
 	vm86.c
+	
+Xvesa_SOURCES = \
+	vesainit.c
 
 Xvesa_LDADD = \
+	$(top_builddir)/hw/kdrive/vesa/libvesa.la \
 	$(top_builddir)/dix/libdix.la		\
 	$(top_builddir)/os/libos.la		\
 	$(top_builddir)/miext/layer/liblayer.la	\