Get Xvesa building

2003-09-11 05:12:51 +00:00 · 2003-09-11 05:12:51 +00:00 · 269b9dac5a
commit 269b9dac5a
parent 0d775576b9
76 changed files with 235 additions and 41 deletions
--- a/hw/kdrive/Makefile.am
+++ b/hw/kdrive/Makefile.am
@ -1,32 +1,4 @@
 SUBDIRS =	\
+	src	\
+	linux	\
 	vesa	\
-	linux
-
-INCLUDES = 					\
-	-I$(top_srcdir)/fb			\
-	-I$(top_srcdir)/include			\
-	-I$(top_srcdir)/mi			\
-	-I$(top_srcdir)/miext/shadow		\
-	-I$(top_srcdir)/randr			\
-	-I$(top_srcdir)/render			
-
-
-noinst_LTLIBRARIES = libkdrive.la
-
-libkdrive_la_SOURCES =	\
-	kaa.c		\
-	kasync.c	\
-	kcmap.c		\
-	kcolor.c	\
-	kcurscol.c	\
-	kdrive.c	\
-	kinfo.c		\
-	kinput.c	\
-	kmap.c		\
-	kmode.c		\
-	knoop.c		\
-	kpict.c		\
-	kshadow.c	\
-	ktest.c		\
-	kxv.c		\
-	vga.c
--- a/hw/kdrive/chips/chips.c
+++ b/hw/kdrive/chips/chips.c
@ -21,6 +21,9 @@
 */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/trident/trident.c,v 1.18 2001/06/04 09:45:42 keithp Exp $ */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "chips.h"
 #include <sys/io.h>

--- a/hw/kdrive/chips/chipsdraw.c
+++ b/hw/kdrive/chips/chipsdraw.c
@ -23,6 +23,9 @@
 */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/trident/tridentdraw.c,v 1.10 2001/06/03 18:48:19 keithp Exp $ */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "chips.h"

 #include	"Xmd.h"
--- a/hw/kdrive/chips/chipsstub.c
+++ b/hw/kdrive/chips/chipsstub.c
@ -24,6 +24,9 @@
 */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/chips/chipsstub.c,v 1.1 2001/09/05 07:12:42 keithp Exp $ */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "chips.h"

 extern int  chips_clk, chips_mclk;
--- a/hw/kdrive/fbdev/fbdev.c
+++ b/hw/kdrive/fbdev/fbdev.c
@ -23,6 +23,9 @@
 */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/fbdev/fbdev.c,v 1.31 2002/10/14 18:01:40 keithp Exp $ */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "fbdev.h"

 /* this code was used to debug MSB 24bpp code on a 16bpp frame buffer */
--- a/hw/kdrive/fbdev/fbinit.c
+++ b/hw/kdrive/fbdev/fbinit.c
@ -23,6 +23,9 @@
 */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/fbdev/fbinit.c,v 1.8 2001/05/29 17:47:55 keithp Exp $ */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <fbdev.h>

 void
--- a/hw/kdrive/i810/i810.c
+++ b/hw/kdrive/i810/i810.c
@ -42,6 +42,9 @@ X Window System is a trademark of The Open Group */
 *
 */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "kdrive.h"
 #include "kxv.h"

--- a/hw/kdrive/i810/i810_cursor.c
+++ b/hw/kdrive/i810/i810_cursor.c
@ -71,6 +71,9 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 *
 */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "kdrive.h"
 #include "kxv.h"
 #include "i810.h"
--- a/hw/kdrive/i810/i810_video.c
+++ b/hw/kdrive/i810/i810_video.c
@ -68,6 +68,9 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 *
 */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "kdrive.h"
 #include "kxv.h"
 #include "i810.h"
--- a/hw/kdrive/i810/i810draw.c
+++ b/hw/kdrive/i810/i810draw.c
@ -35,6 +35,9 @@ X Window System is a trademark of The Open Group */
   Author: Pontus Lidman <pontus.lidman@nokia.com>
 */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "kdrive.h"
 #ifdef XV
 #include "kxv.h"
--- a/hw/kdrive/i810/i810stub.c
+++ b/hw/kdrive/i810/i810stub.c
@ -36,6 +36,9 @@ X Window System is a trademark of The Open Group */
   Author: Pontus Lidman <pontus.lidman@nokia.com>
 */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "kdrive.h"
 #include "kxv.h"
 #include "i810.h"
--- a/hw/kdrive/igs/igs.c
+++ b/hw/kdrive/igs/igs.c
@ -23,6 +23,9 @@
 * Author:  Keith Packard, SuSE, Inc.
 */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "igs.h"

 Bool
--- a/hw/kdrive/igs/igscmap.c
+++ b/hw/kdrive/igs/igscmap.c
@ -22,6 +22,9 @@
 * PERFORMANCE OF THIS SOFTWARE.
 */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "igs.h"

 #define IGS_DAC_SHIFT	8
--- a/hw/kdrive/igs/igscurs.c
+++ b/hw/kdrive/igs/igscurs.c
@ -22,6 +22,9 @@
 * PERFORMANCE OF THIS SOFTWARE.
 */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "igs.h"
 #include "cursorstr.h"

--- a/hw/kdrive/igs/igsdraw.c
+++ b/hw/kdrive/igs/igsdraw.c
@ -22,6 +22,9 @@
 * PERFORMANCE OF THIS SOFTWARE.
 */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "igs.h"
 #include "igsdraw.h"

--- a/hw/kdrive/igs/igsreg.c
+++ b/hw/kdrive/igs/igsreg.c
@ -22,6 +22,9 @@
 * PERFORMANCE OF THIS SOFTWARE.
 */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "igsreg.h"
 #include <stdio.h>

--- a/hw/kdrive/igs/igsstub.c
+++ b/hw/kdrive/igs/igsstub.c
@ -22,6 +22,9 @@
 * PERFORMANCE OF THIS SOFTWARE.
 */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "igs.h"

 void
--- a/hw/kdrive/ipaq/ipaq.c
+++ b/hw/kdrive/ipaq/ipaq.c
@ -24,6 +24,9 @@
 */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/ipaq/ipaq.c,v 1.2 2001/05/29 17:47:55 keithp Exp $ */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "pcmcia.h"

 extern KdCardFuncs  pcmciaFuncs;
--- a/hw/kdrive/itsy/itsy.c
+++ b/hw/kdrive/itsy/itsy.c
@ -23,6 +23,9 @@
 */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/itsy/itsy.c,v 1.2 1999/12/30 03:03:09 robin Exp $ */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "itsy.h"

 /* struct with LCD characteristics defined in fb_brutus.h  */
--- a/hw/kdrive/itsy/kbd.c
+++ b/hw/kdrive/itsy/kbd.c
@ -23,6 +23,9 @@
 */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/itsy/kbd.c,v 1.1 1999/11/19 13:53:53 hohndel Exp $ */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "itsy.h"
 #include "kkeymap.h"
 #include <X11/keysym.h>
--- a/hw/kdrive/itsy/ts.c
+++ b/hw/kdrive/itsy/ts.c
@ -23,6 +23,9 @@
 */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/itsy/ts.c,v 1.1 1999/11/19 13:53:54 hohndel Exp $ */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define NEED_EVENTS
 #include "itsy.h"
 #include <X11/Xproto.h>
--- a/hw/kdrive/linux/Makefile.am
+++ b/hw/kdrive/linux/Makefile.am
@ -1,6 +1,6 @@
 INCLUDES = 					\
-	$(X_CFLAGS)		\
-	-I$(top_srcdir)/hw/kdrive		\
+	$(X_CFLAGS)				\
+	-I$(top_srcdir)/hw/kdrive/src		\
 	-I$(top_srcdir)/include			\
 	-I$(top_srcdir)/mi			\
 	-I$(top_srcdir)/fb			\
--- a/hw/kdrive/linux/agp.c
+++ b/hw/kdrive/linux/agp.c
@ -41,6 +41,9 @@ of the copyright holder.
 * Author: Pontus Lidman <pontus.lidman@nokia.com> (adaption to KDrive) and others
 */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/X.h>

 #include <unistd.h>
--- a/hw/kdrive/linux/bus.c
+++ b/hw/kdrive/linux/bus.c
@ -22,6 +22,9 @@
 * PERFORMANCE OF THIS SOFTWARE.
 */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define NEED_EVENTS
 #include <X11/X.h>
 #include <X11/Xproto.h>
--- a/hw/kdrive/linux/keyboard.c
+++ b/hw/kdrive/linux/keyboard.c
@ -22,6 +22,9 @@
 * PERFORMANCE OF THIS SOFTWARE.
 */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "kdrive.h"
 #include "kkeymap.h"
 #include <linux/keyboard.h>
--- a/hw/kdrive/linux/linux.c
+++ b/hw/kdrive/linux/linux.c
@ -22,6 +22,9 @@
 * PERFORMANCE OF THIS SOFTWARE.
 */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "kdrive.h"
 #include <errno.h>
 #include <signal.h>
--- a/hw/kdrive/linux/mouse.c
+++ b/hw/kdrive/linux/mouse.c
@ -22,6 +22,9 @@
 * PERFORMANCE OF THIS SOFTWARE.
 */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define NEED_EVENTS
 #include <errno.h>
 #include <termios.h>
--- a/hw/kdrive/linux/ms.c
+++ b/hw/kdrive/linux/ms.c
@ -22,6 +22,9 @@ THE SOFTWARE.
 */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/linux/ms.c,v 1.1 2001/08/09 20:45:15 dawes Exp $ */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define NEED_EVENTS
 #include <errno.h>
 #include <termios.h>
--- a/hw/kdrive/linux/ps2.c
+++ b/hw/kdrive/linux/ps2.c
@ -22,6 +22,9 @@
 * PERFORMANCE OF THIS SOFTWARE.
 */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define NEED_EVENTS
 #include <X11/X.h>
 #include <X11/Xproto.h>
--- a/hw/kdrive/linux/ts.c
+++ b/hw/kdrive/linux/ts.c
@ -25,6 +25,9 @@
 * PERFORMANCE OF THIS SOFTWARE.
 */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define NEED_EVENTS
 #include <X11/X.h>
 #include <X11/Xproto.h>
--- a/hw/kdrive/linux/tslib.c
+++ b/hw/kdrive/linux/tslib.c
@ -46,6 +46,9 @@
 */


+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define NEED_EVENTS
 #include <X11/X.h>
 #include <X11/Xproto.h>
--- a/hw/kdrive/mach64/mach64.c
+++ b/hw/kdrive/mach64/mach64.c
@ -21,6 +21,9 @@
 */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/mach64/mach64.c,v 1.10 2002/10/14 18:01:41 keithp Exp $ */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "mach64.h"
 #include <sys/io.h>

--- a/hw/kdrive/mach64/mach64curs.c
+++ b/hw/kdrive/mach64/mach64curs.c
@ -23,6 +23,9 @@
 */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/trident/tridentcurs.c,v 1.6 2000/09/03 05:11:20 keithp Exp $ */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "trident.h"
 #include "cursorstr.h"

--- a/hw/kdrive/mach64/mach64draw.c
+++ b/hw/kdrive/mach64/mach64draw.c
@ -23,6 +23,9 @@
 */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/mach64/mach64draw.c,v 1.6 2001/07/23 03:44:17 keithp Exp $ */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "mach64.h"
 #include "mach64draw.h"

--- a/hw/kdrive/mach64/mach64stub.c
+++ b/hw/kdrive/mach64/mach64stub.c
@ -24,6 +24,9 @@
 */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/mach64/mach64stub.c,v 1.2 2001/10/12 06:33:10 keithp Exp $ */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "mach64.h"

 void
--- a/hw/kdrive/mach64/mach64video.c
+++ b/hw/kdrive/mach64/mach64video.c
@ -20,6 +20,9 @@
 * PERFORMANCE OF THIS SOFTWARE.
 */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/mach64/mach64video.c,v 1.9tsi Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "mach64.h"

 #include "Xv.h"
--- a/hw/kdrive/pcmcia/pcmcia.c
+++ b/hw/kdrive/pcmcia/pcmcia.c
@ -29,6 +29,9 @@
 */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/pcmcia/pcmcia.c,v 1.6 2002/10/14 18:01:41 keithp Exp $ */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "pcmcia.h"
 #define extern
 #include <asm/io.h>
--- a/hw/kdrive/pcmcia/pcmciacurs.c
+++ b/hw/kdrive/pcmcia/pcmciacurs.c
@ -23,6 +23,9 @@
 */
 /* $RCSId: $ */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "pcmcia.h"
 #include "cursorstr.h"

--- a/hw/kdrive/pcmcia/pcmciarotate.c
+++ b/hw/kdrive/pcmcia/pcmciarotate.c
@ -22,6 +22,9 @@
 * PERFORMANCE OF THIS SOFTWARE.
 */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include    <X11/X.h>
 #include    "scrnintstr.h"
 #include    "windowstr.h"
--- a/hw/kdrive/pcmcia/pcmciashadow.c
+++ b/hw/kdrive/pcmcia/pcmciashadow.c
@ -23,6 +23,9 @@
 */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/pcmcia/pcmciashadow.c,v 1.1 2001/05/23 08:56:09 alanh Exp $ */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include    <X11/X.h>
 #include    "scrnintstr.h"
 #include    "windowstr.h"
--- a/hw/kdrive/pcmcia/pcmciastub.c
+++ b/hw/kdrive/pcmcia/pcmciastub.c
@ -23,6 +23,9 @@
 */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/pcmcia/pcmciastub.c,v 1.1 2001/05/23 08:56:09 alanh Exp $ */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "pcmcia.h"

 void
--- a/hw/kdrive/savage/s3.c
+++ b/hw/kdrive/savage/s3.c
@ -24,6 +24,9 @@
 */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3.c,v 1.4 2000/05/06 22:17:44 keithp Exp $ */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "s3.h"

 #define REGISTERS_OFFSET    (0x1000000)
--- a/hw/kdrive/savage/s3clock.c
+++ b/hw/kdrive/savage/s3clock.c
@ -24,6 +24,9 @@
 */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3clock.c,v 1.3 2000/02/23 20:30:02 dawes Exp $ */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "s3.h"

 /*
--- a/hw/kdrive/savage/s3cmap.c
+++ b/hw/kdrive/savage/s3cmap.c
@ -24,6 +24,9 @@
 */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3cmap.c,v 1.4 2000/05/06 22:17:45 keithp Exp $ */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "s3.h"

 void
--- a/hw/kdrive/savage/s3curs.c
+++ b/hw/kdrive/savage/s3curs.c
@ -24,6 +24,9 @@
 */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3curs.c,v 1.3 2000/02/23 20:30:03 dawes Exp $ */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "s3.h"
 #include "s3draw.h"
 #include "cursorstr.h"
--- a/hw/kdrive/savage/s3draw.c
+++ b/hw/kdrive/savage/s3draw.c
@ -24,6 +24,9 @@
 */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3draw.c,v 1.6 2001/05/29 04:54:11 keithp Exp $ */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include	"s3.h"
 #include	"s3draw.h"

--- a/hw/kdrive/savage/s3gc.c
+++ b/hw/kdrive/savage/s3gc.c
@ -24,6 +24,9 @@
 */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3gc.c,v 1.3 2000/01/21 01:12:02 dawes Exp $ */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include	"s3.h"
 #include	"s3draw.h"

--- a/hw/kdrive/savage/s3reg.c
+++ b/hw/kdrive/savage/s3reg.c
@ -24,6 +24,9 @@
 */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3reg.c,v 1.3 2000/02/23 20:30:04 dawes Exp $ */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "s3reg.h"

 #define CR00 S3_CR+0x00
--- a/hw/kdrive/savage/s3rtst.c
+++ b/hw/kdrive/savage/s3rtst.c
@ -24,6 +24,9 @@
 */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3rtst.c,v 1.1 1999/11/19 13:53:57 hohndel Exp $ */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdio.h>
 #include "s3reg.h"

--- a/hw/kdrive/savage/s3stub.c
+++ b/hw/kdrive/savage/s3stub.c
@ -24,6 +24,9 @@
 */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3stub.c,v 1.3 2000/02/23 20:30:05 dawes Exp $ */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "s3.h"

 void
--- a/hw/kdrive/sis530/sis.c
+++ b/hw/kdrive/sis530/sis.c
@ -23,6 +23,9 @@
 */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/sis530/sis.c,v 1.4 2000/05/06 22:17:49 keithp Exp $ */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "sis.h"

 #define MAX_FB_SIZE	(4096 * 1024)
--- a/hw/kdrive/sis530/sisclock.c
+++ b/hw/kdrive/sis530/sisclock.c
@ -23,6 +23,9 @@
 */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/sis530/sisclock.c,v 1.1 1999/11/19 13:53:59 hohndel Exp $ */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "sis.h"
 #include <stdio.h>

--- a/hw/kdrive/sis530/siscmap.c
+++ b/hw/kdrive/sis530/siscmap.c
@ -23,6 +23,9 @@
 */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/sis530/siscmap.c,v 1.1 1999/11/19 13:53:59 hohndel Exp $ */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "sis.h"

 void
--- a/hw/kdrive/sis530/siscurs.c
+++ b/hw/kdrive/sis530/siscurs.c
@ -23,6 +23,9 @@
 */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/sis530/siscurs.c,v 1.1 1999/11/19 13:53:59 hohndel Exp $ */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "sis.h"
 #include "cursorstr.h"

--- a/hw/kdrive/sis530/sisdraw.c
+++ b/hw/kdrive/sis530/sisdraw.c
@ -23,6 +23,9 @@
 */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/sis530/sisdraw.c,v 1.5 2000/08/09 17:52:44 keithp Exp $ */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "sis.h"
 #include "sisdraw.h"

--- a/hw/kdrive/sis530/sisio.c
+++ b/hw/kdrive/sis530/sisio.c
@ -23,6 +23,9 @@
 */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/sis530/sisio.c,v 1.1 1999/11/19 13:54:00 hohndel Exp $ */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifdef linux
 #define extern
 #include <asm/io.h>
--- a/hw/kdrive/sis530/sisstub.c
+++ b/hw/kdrive/sis530/sisstub.c
@ -24,6 +24,9 @@
 */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/sis530/sisstub.c,v 1.4 2000/08/09 17:52:44 keithp Exp $ */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "sis.h"

 static const int   sisCards[] = { 0x6306, 0x0200 };
--- a/hw/kdrive/trident/trident.c
+++ b/hw/kdrive/trident/trident.c
@ -21,6 +21,9 @@
 */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/trident/trident.c,v 1.17 2001/06/03 18:48:19 keithp Exp $ */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "trident.h"
 #include <sys/io.h>

--- a/hw/kdrive/trident/tridentcurs.c
+++ b/hw/kdrive/trident/tridentcurs.c
@ -23,6 +23,9 @@
 */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/trident/tridentcurs.c,v 1.5 2000/08/29 17:20:15 keithp Exp $ */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "trident.h"
 #include "cursorstr.h"

--- a/hw/kdrive/trident/tridentdraw.c
+++ b/hw/kdrive/trident/tridentdraw.c
@ -23,6 +23,9 @@
 */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/trident/tridentdraw.c,v 1.10 2001/06/03 18:48:19 keithp Exp $ */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "trident.h"
 #include "tridentdraw.h"

--- a/hw/kdrive/trident/tridentstub.c
+++ b/hw/kdrive/trident/tridentstub.c
@ -24,6 +24,9 @@
 */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/trident/tridentstub.c,v 1.5 2000/11/29 08:42:25 keithp Exp $ */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "trident.h"

 extern int  trident_clk, trident_mclk;
--- a/hw/kdrive/trio/s3.c
+++ b/hw/kdrive/trio/s3.c
@ -23,6 +23,9 @@
 */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/trio/s3.c,v 1.4 2000/05/06 22:17:52 keithp Exp $ */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "s3.h"

 #define REGISTERS_OFFSET    (0x1000000)
--- a/hw/kdrive/trio/s3clock.c
+++ b/hw/kdrive/trio/s3clock.c
@ -23,6 +23,9 @@
 */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/trio/s3clock.c,v 1.2 1999/12/30 03:03:19 robin Exp $ */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "s3.h"

 /*
--- a/hw/kdrive/trio/s3cmap.c
+++ b/hw/kdrive/trio/s3cmap.c
@ -23,6 +23,9 @@
 */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/trio/s3cmap.c,v 1.1 1999/11/19 13:54:05 hohndel Exp $ */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "s3.h"

 void
--- a/hw/kdrive/trio/s3curs.c
+++ b/hw/kdrive/trio/s3curs.c
@ -23,6 +23,9 @@
 */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/trio/s3curs.c,v 1.2 1999/12/30 03:03:19 robin Exp $ */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "s3.h"
 #include "s3draw.h"
 #include "cursorstr.h"
--- a/hw/kdrive/trio/s3stub.c
+++ b/hw/kdrive/trio/s3stub.c
@ -24,6 +24,9 @@
 */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/trio/s3stub.c,v 1.3 2000/02/23 20:30:13 dawes Exp $ */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "s3.h"

 void
--- a/hw/kdrive/ts300/ts300.c
+++ b/hw/kdrive/ts300/ts300.c
@ -23,6 +23,9 @@
 */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/ts300/ts300.c,v 1.3 2000/02/23 20:30:14 dawes Exp $ */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "kdrive.h"

 extern KdCardFuncs  sisFuncs;
--- a/hw/kdrive/vesa/Makefile.am
+++ b/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
--- a/hw/kdrive/vesa/vbe.c
+++ b/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
--- a/hw/kdrive/vesa/vesa.c
+++ b/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>
--- a/hw/kdrive/vesa/vesainit.c
+++ b/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 = {
--- a/hw/kdrive/vesa/vga.c
+++ b/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[] = {
--- a/hw/kdrive/vesa/vm86.c
+++ b/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) \
--- a/hw/kdrive/vxworks/vxkbd.c
+++ b/hw/kdrive/vxworks/vxkbd.c
@ -6,6 +6,9 @@
 * Author: Keith Packard
 */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "kdrive.h"
 #include "kkeymap.h"
 #include <X11/keysym.h>
--- a/hw/kdrive/vxworks/vxmouse.c
+++ b/hw/kdrive/vxworks/vxmouse.c
@ -6,6 +6,9 @@
 * Author: Keith Packard
 */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define NEED_EVENTS
 #include <X11/X.h>
 #include <X11/Xproto.h>
--- a/hw/kdrive/vxworks/vxworks.c
+++ b/hw/kdrive/vxworks/vxworks.c
@ -6,6 +6,9 @@
 * Author: Keith Packard
 */

+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "kdrive.h"
 #include <X11/keysym.h>