Build fixes: XSERVER_LIBS -> KDRIVE_LIBS, config.h -> kdrive-config.h

2005-12-27 08:29:50 +00:00 · 2005-12-27 08:29:50 +00:00 · 7fd73d2953
parent 2f3ac6e5fc
commit 7fd73d2953
162 changed files with 331 additions and 159 deletions
--- a/163
+++ b/163
@ -12,6 +12,169 @@
 	* hw/kdrive/*:
 	Start importing kdrive.

+	* hw/kdrive/Makefile.am:
+	* hw/kdrive/ati/Makefile.am:
+	* hw/kdrive/ati/ati.c:
+	* hw/kdrive/ati/ati.h:
+	* hw/kdrive/ati/ati_cursor.c:
+	* hw/kdrive/ati/ati_draw.c:
+	* hw/kdrive/ati/ati_dri.c:
+	* hw/kdrive/ati/ati_stub.c:
+	* hw/kdrive/ati/ati_video.c:
+	* hw/kdrive/ati/radeon_composite.c:
+	* hw/kdrive/chips/Makefile.am:
+	* hw/kdrive/chips/chips.c:
+	* hw/kdrive/chips/chipsdraw.c:
+	* hw/kdrive/chips/chipsstub.c:
+	* hw/kdrive/ephyr/Makefile.am:
+	* hw/kdrive/ephyr/ephyr.c:
+	* hw/kdrive/ephyr/ephyr.h:
+	* hw/kdrive/ephyr/ephyrinit.c:
+	* hw/kdrive/ephyr/os.c:
+	* hw/kdrive/epson/Makefile.am:
+	* hw/kdrive/epson/epson13806.c:
+	* hw/kdrive/epson/epson13806stub.c:
+	* hw/kdrive/fake/Makefile.am:
+	* hw/kdrive/fake/fake.c:
+	* hw/kdrive/fake/fakeinit.c:
+	* hw/kdrive/fake/kbd.c:
+	* hw/kdrive/fake/mouse.c:
+	* hw/kdrive/fake/os.c:
+	* hw/kdrive/fbdev/Makefile.am:
+	* hw/kdrive/fbdev/fbdev.c:
+	* hw/kdrive/fbdev/fbinit.c:
+	* hw/kdrive/i810/Makefile.am:
+	* hw/kdrive/i810/i810.c:
+	* hw/kdrive/i810/i810_cursor.c:
+	* hw/kdrive/i810/i810_video.c:
+	* hw/kdrive/i810/i810draw.c:
+	* hw/kdrive/i810/i810stub.c:
+	* hw/kdrive/igs/igs.c:
+	* hw/kdrive/igs/igscmap.c:
+	* hw/kdrive/igs/igscurs.c:
+	* hw/kdrive/igs/igsdraw.c:
+	* hw/kdrive/igs/igsreg.c:
+	* hw/kdrive/igs/igsstub.c:
+	* hw/kdrive/ipaq/ipaq.c:
+	* hw/kdrive/itsy/itsy.c:
+	* hw/kdrive/itsy/kbd.c:
+	* hw/kdrive/itsy/ts.c:
+	* hw/kdrive/linux/Makefile.am:
+	* hw/kdrive/linux/agp.c:
+	* hw/kdrive/linux/bus.c:
+	* hw/kdrive/linux/evdev.c:
+	* hw/kdrive/linux/keyboard.c:
+	* hw/kdrive/linux/linux.c:
+	* hw/kdrive/linux/mouse.c:
+	* hw/kdrive/linux/ms.c:
+	* hw/kdrive/linux/ps2.c:
+	* hw/kdrive/linux/ts.c:
+	* hw/kdrive/linux/tslib.c:
+	* hw/kdrive/mach64/Makefile.am:
+	* hw/kdrive/mach64/mach64.c:
+	* hw/kdrive/mach64/mach64curs.c:
+	* hw/kdrive/mach64/mach64draw.c:
+	* hw/kdrive/mach64/mach64stub.c:
+	* hw/kdrive/mach64/mach64video.c:
+	* hw/kdrive/mga/Makefile.am:
+	* hw/kdrive/mga/g400_composite.c:
+	* hw/kdrive/mga/mga.c:
+	* hw/kdrive/mga/mgadraw.c:
+	* hw/kdrive/mga/mgastub.c:
+	* hw/kdrive/neomagic/Makefile.am:
+	* hw/kdrive/neomagic/backend.c:
+	* hw/kdrive/neomagic/neo_draw.c:
+	* hw/kdrive/neomagic/neomagic.c:
+	* hw/kdrive/neomagic/neomagicstub.c:
+	* hw/kdrive/nvidia/Makefile.am:
+	* hw/kdrive/nvidia/nvidia.c:
+	* hw/kdrive/nvidia/nvidiacurs.c:
+	* hw/kdrive/nvidia/nvidiadraw.c:
+	* hw/kdrive/nvidia/nvidiastub.c:
+	* hw/kdrive/nvidia/nvidiavideo.c:
+	* hw/kdrive/pcmcia/pcmcia.c:
+	* hw/kdrive/pcmcia/pcmciacurs.c:
+	* hw/kdrive/pcmcia/pcmciarotate.c:
+	* hw/kdrive/pcmcia/pcmciashadow.c:
+	* hw/kdrive/pcmcia/pcmciastub.c:
+	* hw/kdrive/pm2/Makefile.am:
+	* hw/kdrive/pm2/pm2.c:
+	* hw/kdrive/pm2/pm2_draw.c:
+	* hw/kdrive/pm2/pm2stub.c:
+	* hw/kdrive/r128/Makefile.am:
+	* hw/kdrive/r128/r128.c:
+	* hw/kdrive/r128/r128draw.c:
+	* hw/kdrive/r128/r128stub.c:
+	* hw/kdrive/savage/s3.c:
+	* hw/kdrive/savage/s3clock.c:
+	* hw/kdrive/savage/s3cmap.c:
+	* hw/kdrive/savage/s3curs.c:
+	* hw/kdrive/savage/s3draw.c:
+	* hw/kdrive/savage/s3gc.c:
+	* hw/kdrive/savage/s3reg.c:
+	* hw/kdrive/savage/s3rtst.c:
+	* hw/kdrive/savage/s3stub.c:
+	* hw/kdrive/sdl/Makefile.am:
+	* hw/kdrive/sdl/sdl.c:
+	* hw/kdrive/sis300/Makefile.am:
+	* hw/kdrive/sis300/sis.c:
+	* hw/kdrive/sis300/sis.h:
+	* hw/kdrive/sis300/sis_draw.c:
+	* hw/kdrive/sis300/sis_stub.c:
+	* hw/kdrive/sis530/sis.c:
+	* hw/kdrive/sis530/sisclock.c:
+	* hw/kdrive/sis530/siscmap.c:
+	* hw/kdrive/sis530/siscurs.c:
+	* hw/kdrive/sis530/sisdraw.c:
+	* hw/kdrive/sis530/sisio.c:
+	* hw/kdrive/sis530/sisstub.c:
+	* hw/kdrive/smi/Makefile.am:
+	* hw/kdrive/smi/smi.c:
+	* hw/kdrive/smi/smidraw.c:
+	* hw/kdrive/smi/smistub.c:
+	* hw/kdrive/smi/smivideo.c:
+	* hw/kdrive/src/Makefile.am:
+	* hw/kdrive/src/kaa.c:
+	* hw/kdrive/src/kaapict.c:
+	* hw/kdrive/src/kasync.c:
+	* hw/kdrive/src/kcmap.c:
+	* hw/kdrive/src/kcolor.c:
+	* hw/kdrive/src/kcurscol.c:
+	* hw/kdrive/src/kdrive.c:
+	* hw/kdrive/src/kinfo.c:
+	* hw/kdrive/src/kinput.c:
+	* hw/kdrive/src/kkeymap.c:
+	* hw/kdrive/src/kloadmap.c:
+	* hw/kdrive/src/kmap.c:
+	* hw/kdrive/src/kmode.c:
+	* hw/kdrive/src/knoop.c:
+	* hw/kdrive/src/koffscreen.c:
+	* hw/kdrive/src/kshadow.c:
+	* hw/kdrive/src/ktest.c:
+	* hw/kdrive/src/kxv.c:
+	* hw/kdrive/src/vga.c:
+	* hw/kdrive/trident/trident.c:
+	* hw/kdrive/trident/tridentcurs.c:
+	* hw/kdrive/trident/tridentdraw.c:
+	* hw/kdrive/trident/tridentstub.c:
+	* hw/kdrive/trio/s3.c:
+	* hw/kdrive/trio/s3clock.c:
+	* hw/kdrive/trio/s3cmap.c:
+	* hw/kdrive/trio/s3curs.c:
+	* hw/kdrive/trio/s3stub.c:
+	* hw/kdrive/ts300/ts300.c:
+	* hw/kdrive/vesa/Makefile.am:
+	* hw/kdrive/vesa/vbe.c:
+	* hw/kdrive/vesa/vesa.c:
+	* hw/kdrive/vesa/vesainit.c:
+	* hw/kdrive/vesa/vga.c:
+	* hw/kdrive/vesa/vm86.c:
+	* hw/kdrive/via/Makefile.am:
+	* hw/kdrive/vxworks/vxkbd.c:
+	* hw/kdrive/vxworks/vxmouse.c:
+	* hw/kdrive/vxworks/vxworks.c:
+	Build fixes: XSERVER_LIBS -> KDRIVE_LIBS, config.h -> kdrive-config.h
+
 2005-12-26  Daniel Stone  <daniel@freedesktop.org>

 	* xkb/xkbInit.c:
--- a/hw/kdrive/Makefile.am
+++ b/hw/kdrive/Makefile.am
@ -1,3 +1,7 @@
+# none of this works yet.  fbdev, ephyr, and the hardware servers all rely
+# on miext/shadow/ changes we haven't brought over yet, and sdl relies on
+# some detection-fu that hasn't been ported.
+
 if KDRIVEVESA
 VESA_SUBDIRS = vesa mach64 mga nvidia r128 smi chips pm2 via neomagic
 endif
--- a/hw/kdrive/ati/Makefile.am
+++ b/hw/kdrive/ati/Makefile.am
@ -27,7 +27,7 @@ INCLUDES = 					\
 	$(DRI_INCLUDES)				\
 	$(FBDEV_INCLUDES)			\
 	$(VESA_INCLUDES)			\
-	@XSERVER_CFLAGS@
+	@KDRIVE_CFLAGS@

 bin_PROGRAMS = Xati

--- a/hw/kdrive/ati/ati.c
+++ b/hw/kdrive/ati/ati.c
@ -24,7 +24,7 @@
 /* $Header$ */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "ati.h"
 #include "ati_reg.h"
--- a/hw/kdrive/ati/ati.h
+++ b/hw/kdrive/ati/ati.h
@ -27,7 +27,7 @@
 #define _ATI_H_

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

 #ifdef KDRIVEFBDEV
--- a/hw/kdrive/ati/ati_cursor.c
+++ b/hw/kdrive/ati/ati_cursor.c
@ -22,7 +22,7 @@
 /* $RCSId$ */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "ati.h"
 #include "ati_reg.h"
--- a/hw/kdrive/ati/ati_draw.c
+++ b/hw/kdrive/ati/ati_draw.c
@ -24,7 +24,7 @@
 /* $Header$ */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "ati.h"
 #include "ati_reg.h"
--- a/hw/kdrive/ati/ati_dri.c
+++ b/hw/kdrive/ati/ati_dri.c
@ -26,7 +26,7 @@
 #include <sys/time.h>

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

 #include "ati.h"
--- a/hw/kdrive/ati/ati_stub.c
+++ b/hw/kdrive/ati/ati_stub.c
@ -24,7 +24,7 @@
 /* $Header$ */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "ati.h"
 #include "klinux.h"
--- a/hw/kdrive/ati/ati_video.c
+++ b/hw/kdrive/ati/ati_video.c
@ -25,7 +25,7 @@
 /* $RCSId$ */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "ati.h"
 #include "ati_dma.h"
--- a/hw/kdrive/ati/radeon_composite.c
+++ b/hw/kdrive/ati/radeon_composite.c
@ -24,7 +24,7 @@
 /* $Header$ */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "ati.h"
 #include "ati_reg.h"
--- a/hw/kdrive/chips/Makefile.am
+++ b/hw/kdrive/chips/Makefile.am
@ -1,7 +1,7 @@
 INCLUDES = 					\
 	@KDRIVE_INCS@				\
 	-I$(top_srcdir)/hw/kdrive/vesa		\
-	@XSERVER_CFLAGS@
+	@KDRIVE_CFLAGS@

 bin_PROGRAMS = Xchips

--- a/hw/kdrive/chips/chips.c
+++ b/hw/kdrive/chips/chips.c
@ -22,7 +22,7 @@
 /* $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>
+#include <kdrive-config.h>
 #endif
 #include "chips.h"
 #include "kaa.h"
--- a/hw/kdrive/chips/chipsdraw.c
+++ b/hw/kdrive/chips/chipsdraw.c
@ -24,7 +24,7 @@
 /* $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>
+#include <kdrive-config.h>
 #endif
 #include "chips.h"

--- a/hw/kdrive/chips/chipsstub.c
+++ b/hw/kdrive/chips/chipsstub.c
@ -25,7 +25,7 @@
 /* $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>
+#include <kdrive-config.h>
 #endif
 #include "chips.h"

--- a/hw/kdrive/ephyr/Makefile.am
+++ b/hw/kdrive/ephyr/Makefile.am
@ -1,6 +1,6 @@
 INCLUDES = 					\
 	@KDRIVE_INCS@				\
-	@XSERVER_CFLAGS@
+	@KDRIVE_CFLAGS@

 noinst_LIBRARIES = libxephyr.a libxephyr-hostx.a

--- a/hw/kdrive/ephyr/ephyr.c
+++ b/hw/kdrive/ephyr/ephyr.c
@ -29,7 +29,7 @@
 */

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

--- a/hw/kdrive/ephyr/ephyr.h
+++ b/hw/kdrive/ephyr/ephyr.h
@ -38,6 +38,8 @@
 #include "randrstr.h"
 #endif

+#include "damage.h"
+
 typedef struct _ephyrPriv {
    CARD8	*base;
    int		bytes_per_line;
--- a/hw/kdrive/ephyr/ephyrinit.c
+++ b/hw/kdrive/ephyr/ephyrinit.c
@ -24,7 +24,7 @@
 */

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

--- a/hw/kdrive/ephyr/os.c
+++ b/hw/kdrive/ephyr/os.c
@ -24,7 +24,7 @@
 */

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

--- a/hw/kdrive/epson/Makefile.am
+++ b/hw/kdrive/epson/Makefile.am
@ -1,6 +1,6 @@
 INCLUDES = 					\
 	@KDRIVE_INCS@				\
-	@XSERVER_CFLAGS@
+	@KDRIVE_CFLAGS@

 bin_PROGRAMS = Xepson

--- a/hw/kdrive/epson/epson13806.c
+++ b/hw/kdrive/epson/epson13806.c
@ -31,7 +31,7 @@
 */

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

 #include <sys/ioctl.h>
--- a/hw/kdrive/epson/epson13806stub.c
+++ b/hw/kdrive/epson/epson13806stub.c
@ -29,7 +29,7 @@
 */

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

 #include <epson13806.h>
--- a/hw/kdrive/fake/Makefile.am
+++ b/hw/kdrive/fake/Makefile.am
@ -1,6 +1,6 @@
 INCLUDES = 					\
 	@KDRIVE_INCS@				\
-	@XSERVER_CFLAGS@
+	@KDRIVE_CFLAGS@

 noinst_LIBRARIES = libfake.a

--- a/hw/kdrive/fake/fake.c
+++ b/hw/kdrive/fake/fake.c
@ -23,7 +23,7 @@
 */

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

--- a/hw/kdrive/fake/fakeinit.c
+++ b/hw/kdrive/fake/fakeinit.c
@ -23,7 +23,7 @@
 */

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

--- a/hw/kdrive/fake/kbd.c
+++ b/hw/kdrive/fake/kbd.c
@ -24,7 +24,7 @@
 /* $RCSId: xc/programs/Xserver/hw/kdrive/fake/kbd.c,v 1.1 1999/11/19 13:53:53 hohndel Exp $ */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "fake.h"
 #include "kkeymap.h"
--- a/hw/kdrive/fake/mouse.c
+++ b/hw/kdrive/fake/mouse.c
@ -23,7 +23,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #define NEED_EVENTS
 #include <errno.h>
--- a/hw/kdrive/fake/os.c
+++ b/hw/kdrive/fake/os.c
@ -23,7 +23,7 @@
 */

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

--- a/hw/kdrive/fbdev/Makefile.am
+++ b/hw/kdrive/fbdev/Makefile.am
@ -1,6 +1,6 @@
 INCLUDES = 					\
 	@KDRIVE_INCS@				\
-	@XSERVER_CFLAGS@
+	@KDRIVE_CFLAGS@

 noinst_LIBRARIES = libfbdev.a

--- a/hw/kdrive/fbdev/fbdev.c
+++ b/hw/kdrive/fbdev/fbdev.c
@ -24,7 +24,7 @@
 /* $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>
+#include <kdrive-config.h>
 #endif
 #include "fbdev.h"
 #include <sys/ioctl.h>
--- a/hw/kdrive/fbdev/fbinit.c
+++ b/hw/kdrive/fbdev/fbinit.c
@ -24,7 +24,7 @@
 /* $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>
+#include <kdrive-config.h>
 #endif
 #include <fbdev.h>

--- a/hw/kdrive/i810/Makefile.am
+++ b/hw/kdrive/i810/Makefile.am
@ -1,6 +1,6 @@
 INCLUDES = 					\
 	@KDRIVE_INCS@				\
-	@XSERVER_CFLAGS@
+	@KDRIVE_CFLAGS@

 bin_PROGRAMS = Xi810

--- a/hw/kdrive/i810/i810.c
+++ b/hw/kdrive/i810/i810.c
@ -43,7 +43,7 @@ X Window System is a trademark of The Open Group */
 */

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

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

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "kdrive.h"
 #include "kxv.h"
--- a/hw/kdrive/i810/i810draw.c
+++ b/hw/kdrive/i810/i810draw.c
@ -36,7 +36,7 @@ X Window System is a trademark of The Open Group */
 */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "kdrive.h"
 #include "kaa.h"
--- a/hw/kdrive/i810/i810stub.c
+++ b/hw/kdrive/i810/i810stub.c
@ -37,7 +37,7 @@ X Window System is a trademark of The Open Group */
 */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "kdrive.h"
 #include "kxv.h"
--- a/hw/kdrive/igs/igs.c
+++ b/hw/kdrive/igs/igs.c
@ -24,7 +24,7 @@
 */

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

--- a/hw/kdrive/igs/igscmap.c
+++ b/hw/kdrive/igs/igscmap.c
@ -23,7 +23,7 @@
 */

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

--- a/hw/kdrive/igs/igscurs.c
+++ b/hw/kdrive/igs/igscurs.c
@ -23,7 +23,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "igs.h"
 #include "cursorstr.h"
--- a/hw/kdrive/igs/igsdraw.c
+++ b/hw/kdrive/igs/igsdraw.c
@ -23,7 +23,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "igs.h"
 #include "igsdraw.h"
--- a/hw/kdrive/igs/igsreg.c
+++ b/hw/kdrive/igs/igsreg.c
@ -23,7 +23,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "igsreg.h"
 #include <stdio.h>
--- a/hw/kdrive/igs/igsstub.c
+++ b/hw/kdrive/igs/igsstub.c
@ -23,7 +23,7 @@
 */

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

--- a/hw/kdrive/ipaq/ipaq.c
+++ b/hw/kdrive/ipaq/ipaq.c
@ -25,7 +25,7 @@
 /* $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>
+#include <kdrive-config.h>
 #endif
 #include "pcmcia.h"

--- a/hw/kdrive/itsy/itsy.c
+++ b/hw/kdrive/itsy/itsy.c
@ -24,7 +24,7 @@
 /* $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>
+#include <kdrive-config.h>
 #endif
 #include "itsy.h"

--- a/hw/kdrive/itsy/kbd.c
+++ b/hw/kdrive/itsy/kbd.c
@ -24,7 +24,7 @@
 /* $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>
+#include <kdrive-config.h>
 #endif
 #include "itsy.h"
 #include "kkeymap.h"
--- a/hw/kdrive/itsy/ts.c
+++ b/hw/kdrive/itsy/ts.c
@ -24,7 +24,7 @@
 /* $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>
+#include <kdrive-config.h>
 #endif
 #define NEED_EVENTS
 #include "itsy.h"
--- a/hw/kdrive/linux/Makefile.am
+++ b/hw/kdrive/linux/Makefile.am
@ -1,6 +1,6 @@
 INCLUDES = 					\
 	@KDRIVE_INCS@				\
-	@XSERVER_CFLAGS@
+	@KDRIVE_CFLAGS@


 noinst_LIBRARIES = liblinux.a
--- a/hw/kdrive/linux/agp.c
+++ b/hw/kdrive/linux/agp.c
@ -42,7 +42,7 @@ of the copyright holder.
 */

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

--- a/hw/kdrive/linux/bus.c
+++ b/hw/kdrive/linux/bus.c
@ -23,7 +23,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #define NEED_EVENTS
 #include <X11/X.h>
--- a/hw/kdrive/linux/evdev.c
+++ b/hw/kdrive/linux/evdev.c
@ -23,7 +23,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #define NEED_EVENTS
 #include <errno.h>
--- a/hw/kdrive/linux/keyboard.c
+++ b/hw/kdrive/linux/keyboard.c
@ -23,7 +23,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "kdrive.h"
 #include "kkeymap.h"
--- a/hw/kdrive/linux/linux.c
+++ b/hw/kdrive/linux/linux.c
@ -23,7 +23,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "kdrive.h"
 #include "klinux.h"
--- a/hw/kdrive/linux/mouse.c
+++ b/hw/kdrive/linux/mouse.c
@ -23,7 +23,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #define NEED_EVENTS
 #include <errno.h>
--- a/hw/kdrive/linux/ms.c
+++ b/hw/kdrive/linux/ms.c
@ -23,7 +23,7 @@ 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>
+#include <kdrive-config.h>
 #endif
 #define NEED_EVENTS
 #include <errno.h>
--- a/hw/kdrive/linux/ps2.c
+++ b/hw/kdrive/linux/ps2.c
@ -23,7 +23,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #define NEED_EVENTS
 #include <X11/X.h>
--- a/hw/kdrive/linux/ts.c
+++ b/hw/kdrive/linux/ts.c
@ -26,7 +26,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #define NEED_EVENTS
 #include <X11/X.h>
--- a/hw/kdrive/linux/tslib.c
+++ b/hw/kdrive/linux/tslib.c
@ -66,7 +66,7 @@


 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #define NEED_EVENTS
 #include <X11/X.h>
--- a/hw/kdrive/mach64/Makefile.am
+++ b/hw/kdrive/mach64/Makefile.am
@ -1,7 +1,7 @@
 INCLUDES = 					\
        @KDRIVE_INCS@				\
 	-I$(top_srcdir)/hw/kdrive/vesa		\
-	@XSERVER_CFLAGS@
+	@KDRIVE_CFLAGS@

 bin_PROGRAMS = Xmach64

--- a/hw/kdrive/mach64/mach64.c
+++ b/hw/kdrive/mach64/mach64.c
@ -22,7 +22,7 @@
 /* $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>
+#include <kdrive-config.h>
 #endif
 #include "mach64.h"
 #include "kaa.h"
--- a/hw/kdrive/mach64/mach64curs.c
+++ b/hw/kdrive/mach64/mach64curs.c
@ -24,7 +24,7 @@
 /* $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>
+#include <kdrive-config.h>
 #endif
 #include "trident.h"
 #include "cursorstr.h"
--- a/hw/kdrive/mach64/mach64draw.c
+++ b/hw/kdrive/mach64/mach64draw.c
@ -24,7 +24,7 @@
 /* $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>
+#include <kdrive-config.h>
 #endif
 #include "mach64.h"
 #include "mach64draw.h"
--- a/hw/kdrive/mach64/mach64stub.c
+++ b/hw/kdrive/mach64/mach64stub.c
@ -25,7 +25,7 @@
 /* $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>
+#include <kdrive-config.h>
 #endif
 #include "mach64.h"
 #include <klinux.h>
--- a/hw/kdrive/mach64/mach64video.c
+++ b/hw/kdrive/mach64/mach64video.c
@ -21,7 +21,7 @@
 */
 /* $RCSId: xc/programs/Xserver/hw/kdrive/mach64/mach64video.c,v 1.9tsi Exp $ */
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "mach64.h"

--- a/hw/kdrive/mga/Makefile.am
+++ b/hw/kdrive/mga/Makefile.am
@ -1,7 +1,7 @@
 INCLUDES = 					\
 	@KDRIVE_INCS@				\
 	-I$(top_srcdir)/hw/kdrive/vesa		\
-	@XSERVER_CFLAGS@
+	@KDRIVE_CFLAGS@

 bin_PROGRAMS = Xmga

--- a/hw/kdrive/mga/g400_composite.c
+++ b/hw/kdrive/mga/g400_composite.c
@ -24,7 +24,7 @@
 /* $Header$ */

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

 #include "mga.h"
--- a/hw/kdrive/mga/mga.c
+++ b/hw/kdrive/mga/mga.c
@ -23,7 +23,7 @@
 */
 /* $Header$ */
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "mga.h"

--- a/hw/kdrive/mga/mgadraw.c
+++ b/hw/kdrive/mga/mgadraw.c
@ -23,7 +23,7 @@
 */
 /* $Header$ */
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "mga.h"
 #include "g400_common.h"
--- a/hw/kdrive/mga/mgastub.c
+++ b/hw/kdrive/mga/mgastub.c
@ -23,7 +23,7 @@
 */
 /* $Header$ */
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "mga.h"

--- a/hw/kdrive/neomagic/Makefile.am
+++ b/hw/kdrive/neomagic/Makefile.am
@ -12,7 +12,7 @@ INCLUDES =                      \
 	@KDRIVE_INCS@               \
 	$(FBDEV_INCLUDES)           \
 	$(VESA_INCLUDES)            \
-	@XSERVER_CFLAGS@
+	@KDRIVE_CFLAGS@

 bin_PROGRAMS = Xneomagic

--- a/hw/kdrive/neomagic/backend.c
+++ b/hw/kdrive/neomagic/backend.c
@ -10,7 +10,7 @@
 */

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

--- a/hw/kdrive/neomagic/neo_draw.c
+++ b/hw/kdrive/neomagic/neo_draw.c
@ -22,7 +22,7 @@
 */

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

--- a/hw/kdrive/neomagic/neomagic.c
+++ b/hw/kdrive/neomagic/neomagic.c
@ -22,7 +22,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "neomagic.h"
 #include <sys/io.h>
--- a/hw/kdrive/neomagic/neomagicstub.c
+++ b/hw/kdrive/neomagic/neomagicstub.c
@ -22,7 +22,7 @@
 */

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

--- a/hw/kdrive/nvidia/Makefile.am
+++ b/hw/kdrive/nvidia/Makefile.am
@ -1,7 +1,7 @@
 INCLUDES = 					\
 	@KDRIVE_INCS@				\
 	-I$(top_srcdir)/hw/kdrive/vesa		\
-	@XSERVER_CFLAGS@
+	@KDRIVE_CFLAGS@

 bin_PROGRAMS = Xnvidia

--- a/hw/kdrive/nvidia/nvidia.c
+++ b/hw/kdrive/nvidia/nvidia.c
@ -23,7 +23,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "nvidia.h"
 #include "kaa.h"
--- a/hw/kdrive/nvidia/nvidiacurs.c
+++ b/hw/kdrive/nvidia/nvidiacurs.c
@ -24,7 +24,7 @@
 /* $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>
+#include <kdrive-config.h>
 #endif
 #include "trident.h"
 #include "cursorstr.h"
--- a/hw/kdrive/nvidia/nvidiadraw.c
+++ b/hw/kdrive/nvidia/nvidiadraw.c
@ -23,7 +23,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "nvidia.h"
 #include "nvidiadraw.h"
--- a/hw/kdrive/nvidia/nvidiastub.c
+++ b/hw/kdrive/nvidia/nvidiastub.c
@ -23,7 +23,7 @@
 */

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

--- a/hw/kdrive/nvidia/nvidiavideo.c
+++ b/hw/kdrive/nvidia/nvidiavideo.c
@ -23,7 +23,7 @@
 */

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

--- a/hw/kdrive/pcmcia/pcmcia.c
+++ b/hw/kdrive/pcmcia/pcmcia.c
@ -30,7 +30,7 @@
 /* $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>
+#include <kdrive-config.h>
 #endif
 #include "pcmcia.h"
 #define extern
--- a/hw/kdrive/pcmcia/pcmciacurs.c
+++ b/hw/kdrive/pcmcia/pcmciacurs.c
@ -24,7 +24,7 @@
 /* $RCSId: $ */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "pcmcia.h"
 #include "cursorstr.h"
--- a/hw/kdrive/pcmcia/pcmciarotate.c
+++ b/hw/kdrive/pcmcia/pcmciarotate.c
@ -23,7 +23,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include    <X11/X.h>
 #include    "scrnintstr.h"
--- a/hw/kdrive/pcmcia/pcmciashadow.c
+++ b/hw/kdrive/pcmcia/pcmciashadow.c
@ -24,7 +24,7 @@
 /* $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>
+#include <kdrive-config.h>
 #endif
 #include    <X11/X.h>
 #include    "scrnintstr.h"
--- a/hw/kdrive/pcmcia/pcmciastub.c
+++ b/hw/kdrive/pcmcia/pcmciastub.c
@ -24,7 +24,7 @@
 /* $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>
+#include <kdrive-config.h>
 #endif
 #include "pcmcia.h"

--- a/hw/kdrive/pm2/Makefile.am
+++ b/hw/kdrive/pm2/Makefile.am
@ -1,7 +1,7 @@
 INCLUDES = 					\
 	@KDRIVE_INCS@				\
 	-I$(top_srcdir)/hw/kdrive/vesa		\
-	@XSERVER_CFLAGS@
+	@KDRIVE_CFLAGS@

 bin_PROGRAMS = Xpm2

--- a/hw/kdrive/pm2/pm2.c
+++ b/hw/kdrive/pm2/pm2.c
@ -1,5 +1,5 @@
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "kdrive.h"
 #include "kaa.h"
--- a/hw/kdrive/pm2/pm2_draw.c
+++ b/hw/kdrive/pm2/pm2_draw.c
@ -1,5 +1,5 @@
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "kdrive.h"
 #include "kaa.h"
--- a/hw/kdrive/pm2/pm2stub.c
+++ b/hw/kdrive/pm2/pm2stub.c
@ -1,5 +1,5 @@
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "kdrive.h"
 #include "klinux.h"
--- a/hw/kdrive/r128/Makefile.am
+++ b/hw/kdrive/r128/Makefile.am
@ -1,7 +1,7 @@
 INCLUDES = 					\
 	@KDRIVE_INCS@				\
 	-I$(top_srcdir)/hw/kdrive/vesa		\
-	@XSERVER_CFLAGS@
+	@KDRIVE_CFLAGS@

 bin_PROGRAMS = Xr128

--- a/hw/kdrive/r128/r128.c
+++ b/hw/kdrive/r128/r128.c
@ -23,7 +23,7 @@
 */
 /* $Header$ */
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "r128.h"

--- a/hw/kdrive/r128/r128draw.c
+++ b/hw/kdrive/r128/r128draw.c
@ -23,7 +23,7 @@
 */
 /* $Header$ */
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "r128.h"
 #include "kaa.h"
--- a/hw/kdrive/r128/r128stub.c
+++ b/hw/kdrive/r128/r128stub.c
@ -23,7 +23,7 @@
 */
 /* $Header$ */
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <kdrive-config.h>
 #endif
 #include "r128.h"
 #include "klinux.h"
--- a/hw/kdrive/savage/s3.c
+++ b/hw/kdrive/savage/s3.c
@ -25,7 +25,7 @@
 /* $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>
+#include <kdrive-config.h>
 #endif
 #include "s3.h"

--- a/hw/kdrive/savage/s3clock.c
+++ b/hw/kdrive/savage/s3clock.c
@ -25,7 +25,7 @@
 /* $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>
+#include <kdrive-config.h>
 #endif
 #include "s3.h"

--- a/hw/kdrive/savage/s3cmap.c
+++ b/hw/kdrive/savage/s3cmap.c
@ -25,7 +25,7 @@
 /* $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>
+#include <kdrive-config.h>
 #endif
 #include "s3.h"

--- a/hw/kdrive/savage/s3curs.c
+++ b/hw/kdrive/savage/s3curs.c
@ -25,7 +25,7 @@
 /* $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>
+#include <kdrive-config.h>
 #endif
 #include "s3.h"
 #include "s3draw.h"
--- a/hw/kdrive/savage/s3draw.c
+++ b/hw/kdrive/savage/s3draw.c
@ -25,7 +25,7 @@
 /* $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>
+#include <kdrive-config.h>
 #endif
 #include	"s3.h"
 #include	"s3draw.h"
--- a/hw/kdrive/savage/s3gc.c
+++ b/hw/kdrive/savage/s3gc.c
@ -25,7 +25,7 @@
 /* $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>
+#include <kdrive-config.h>
 #endif
 #include	"s3.h"
 #include	"s3draw.h"
--- a/Show More
+++ b/Show More