--- config/cf/xf86site.def.orig	Mon Aug  2 03:37:48 1999
+++ config/cf/xf86site.def	Tue Sep 21 18:45:38 1999
@@ -57,7 +57,7 @@
  *
  * This should automatically get set correctly by imake.
  *
-#define LinuxBinUtilsMajorVersion	26
+#define LinuxBinUtilsMajorVersion	29
  */
 
 /*
@@ -66,8 +66,8 @@
  *
  * This should automatically get set correctly by imake.
  *
-#define LinuxCLibMajorVersion	5
-#define LinuxClibMinorVersion	4
+#define LinuxCLibMajorVersion	6
+#define LinuxClibMinorVersion	0
  */
 
 /*
@@ -101,8 +101,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
@@ -115,10 +115,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
@@ -132,8 +132,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
@@ -143,10 +143,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
@@ -339,8 +339,8 @@
  * fonts once, if this is a first time install you will want to build the
  * fonts)
  *
-#define BuildFonts		NO
  */
+#define BuildFonts		NO
 
 /*
  * To not build/install the 75dpi fonts, uncomment the following
@@ -400,7 +400,7 @@
  * will need to be built with the Joystick driver in order to be able to
  * use this.
  *
-#define JoystickSupport		NO
+#define JoystickSupport		YES
 #define WacomSupport		YES
 #define MicroTouchSupport	YES 
 #define ElographicsSupport	YES 
@@ -538,8 +538,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