? Makefile
? xorgconfig
? xorgconfig.1x.html
? xorgconfig._man
Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/xf86config/Imakefile,v
retrieving revision 1.4
diff -u -p -r1.4 Imakefile
--- Imakefile	21 Jul 2004 07:31:10 -0000	1.4
+++ Imakefile	11 Aug 2004 18:15:32 -0000
@@ -12,6 +12,10 @@ XCOMM $XConsortium: Imakefile /main/5 19
          DEPLIBS =
       CARDDBFILE = $(LIBDIR)/Cards
 
+#if UseDeprecatedKeyboardDriver
+KEYBOARD_DEFS = -DUSE_DEPRECATED_KEYBOARD_DRIVER
+#endif
+
 XCONFIGFILE = XConfigFile
 #if defined XFree86Version
 XVERS = XFree86Version
@@ -35,7 +39,7 @@ SITE_FONT_PATH = -DCOMPILEDDEFAULTFONTPA
 		   -DXDOCDIR=\"$(DOCDIR)\" $(SITE_FONT_PATH) \
 		   -DFILEMANSUFFIX=\"$(FILEMANSUFFIX)\" \
 		   -DXVERSIONSTRING=\"$(XVERSIONSTRING)\" \
-		   $(VENDOR_DEFINES)
+		   $(VENDOR_DEFINES) $(KEYBOARD_DEFS)
 
 
 AllTarget(ProgramTargetName(xorgconfig))
Index: xorgconfig.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/xf86config/xorgconfig.c,v
retrieving revision 1.4
diff -u -p -r1.4 xorgconfig.c
--- xorgconfig.c	28 Jul 2004 03:57:19 -0000	1.4
+++ xorgconfig.c	11 Aug 2004 18:15:34 -0000
@@ -2043,7 +2043,11 @@ static char *XF86Config_fontpathchunk_te
 "Section \"InputDevice\"\n"
 "\n"
 "    Identifier	\"Keyboard1\"\n"
+#ifdef USE_DEPRECATED_KEYBOARD_DRIVER
 "    Driver	\"Keyboard\"\n"
+#else
+"    Driver	\"kbd\"\n"
+#endif
 "\n"
 "# For most OSs the protocol can be omitted (it defaults to \"Standard\").\n"
 "# When using XQUEUE (only for SVR3 and SVR4, but not Solaris),\n"