--- ./config/cf/xf86site.def.orig	Wed Jan 16 10:36:00 2002
+++ ./config/cf/xf86site.def	Wed Jan 23 14:52:38 2002
@@ -98,7 +98,7 @@
  *
  * This should automatically get set correctly by imake.
  *
-#define LinuxBinUtilsMajorVersion	26
+#define LinuxBinUtilsMajorVersion	29
  */
 
 /*
@@ -107,8 +107,8 @@
  *
  * This should automatically get set correctly by imake.
  *
-#define LinuxCLibMajorVersion	5
-#define LinuxClibMinorVersion	4
+#define LinuxCLibMajorVersion	6
+#define LinuxClibMinorVersion	0
  */
 
 /*
@@ -142,8 +142,8 @@
  * Note: version 4.0 or 4.1 is required, and XF86Setup links it statically by
  * default.
  *
-#define HasTk			YES
  */
+#define HasTk			YES
 
 /*
  * Set the paths and names for your Tk library if they don't match the
@@ -156,10 +156,10 @@
  *
  * Some Linux releases need TkLibDir set to /usr/X11R6/lib
  *
-#define TkLibDir		/usr/local/lib
-#define TkIncDir		/usr/local/include
-#define TkLibName		tk
  */
+#define TkLibDir		/usr/lib
+#define TkIncDir		/usr/include
+#define TkLibName		tk
 
 /*
  * By default, XF86Setup is linked with a static Tk library.  To change
@@ -173,8 +173,8 @@
  * Note: version 7.4 or 7.5 is required, and XF86Setup links it statically by
  * default.
  *
-#define HasTcl			YES
  */
+#define HasTcl			YES
 
 /*
  * Set the paths and names for your Tcl library if they don't match the
@@ -184,10 +184,10 @@
  *
  * Some Linux releases need TclIncDir set to /usr/include/tcl.
  *
-#define TclLibDir		/usr/local/lib
-#define TclIncDir		/usr/local/include
-#define TclLibName		tcl
  */
+#define TclLibDir		/usr/lib
+#define TclIncDir		/usr/include
+#define TclLibName		tcl
 
 /*
  * By default, XF86Setup is linked with a static Tcl library.  To change
@@ -485,6 +485,10 @@
 				microtouch mutouch penmount spaceorb summa \
 				wacom void magictouch
  */
+#define XInputDrivers		mouse calcomp citron \
+				digitaledge dmc dynapro elographics \
+				microtouch mutouch penmount spaceorb summa \
+				wacom void magictouch
 
 /*
  * Uncomment this for joystick support.
@@ -641,8 +645,8 @@
  * To forceably build static libraries in addition to shared libraries,
  * uncomment this.
  *
-#define ForceNormalLib		YES
  */
+#define ForceNormalLib		YES
 
 /*
  * Uncomment this if your default tools (eg, gcc, ld, as, etc) are