Get Xvesa building

hw/kdrive/vesa/Makefile.am

@@ -1,6 +1,6 @@
 INCLUDES = 					\
 	-I$(top_srcdir)/fb			\
-	-I$(top_srcdir)/hw/kdrive		\
+	-I$(top_srcdir)/hw/kdrive/src		\
 	-I$(top_srcdir)/include			\
 	-I$(top_srcdir)/mi			\
 	-I$(top_srcdir)/miext/layer		\
@@ -20,16 +20,19 @@ Xvesa_SOURCES = \
 
 Xvesa_LDADD = \
 	$(top_builddir)/dix/libdix.la		\
-	$(top_builddir)/hw/kdrive/libkdrive.la  \
+	$(top_builddir)/os/libos.la		\
+	$(top_builddir)/miext/layer/liblayer.la	\
+	$(top_builddir)/hw/kdrive/src/libkdrive.la  \
 	$(top_builddir)/hw/kdrive/linux/liblinux.la  \
+	$(top_builddir)/miext/shadow/libshadow.la \
+	$(top_builddir)/randr/librandr.la	\
+	$(top_builddir)/render/librender.la	\
 	$(top_builddir)/fb/libfb.la		\
 	$(top_builddir)/mi/libmi.la		\
-	$(top_builddir)/Xext
-	$(top_builddir)/miext/layer/liblayer.la	\
-	$(top_builddir)/miext/shadow/libshadow.la \
-	$(top_builddir)/render/librender.la	\
+	$(top_builddir)/Xext/libXext.la		\
 	$(top_builddir)/randr/librandr.la	\
-	$(top_builddir)/os/libos.la		\
+	$(top_builddir)/render/librender.la	\
 	$(top_builddir)/xtrans/libxtrans.la	\
 	$(X_LIBS) -lXfont -lXau -lXdmcp 	\
-	-lm -lz
+	$(top_builddir)/dix/libxpstubs.la	\
+	-lfreetype -lm -lz

hw/kdrive/vesa/vbe.c

@@ -21,6 +21,9 @@ THE SOFTWARE.
 */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/vesa/vbe.c,v 1.9 2001/05/29 04:54:12 keithp Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "vesa.h"
 
 int

hw/kdrive/vesa/vesa.c

@@ -19,8 +19,11 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/vesa/vesa.c,v 1.21 2002/10/14 18:01:42 keithp Exp $ */
+/* $Id$ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "vesa.h"
 #ifdef RANDR
 #include <randrstr.h>

hw/kdrive/vesa/vesainit.c

@@ -21,6 +21,9 @@ THE SOFTWARE.
 */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/vesa/vesainit.c,v 1.7 2001/09/05 07:12:43 keithp Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "vesa.h"
 
 const KdCardFuncs vesaFuncs = {

hw/kdrive/vesa/vga.c

@@ -22,6 +22,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "vesa.h"
 
 static const VesaModeRec vgaModes[] = {

hw/kdrive/vesa/vm86.c

@@ -43,6 +43,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "vm86.h"
 
 #define PUSHW(vi, i) \