--- xf86site.def.dist	Sun Nov  8 20:19:11 1998
+++ xf86site.def	Fri Mar 12 22:12:52 1999
@@ -48,8 +48,8 @@
  * If you are building binaries for a 486, it may be beneficial to add
  * -m486
  *
-#define DefaultGcc2i386Opt	-O2 -fno-strength-reduce
  */
+#define DefaultGcc2i386Opt	-O3
 
 /*
  * For Linux, this should match the Binutils version you have.  This example
@@ -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,25 +115,25 @@
  *
  * 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/local/tcl/lib
+#define TkIncDir		/usr/local/tcl/include
+#define TkLibName		tk80jp
 
 /*
  * By default, XF86Setup is linked with a static Tk library.  To change
  * that, uncomment the following line.
  *
-#define XF86SetupUsesStaticTk	NO
  */
+#define XF86SetupUsesStaticTk	NO
 
 /*
  * If you have Tcl (which is required to build XF86Setup), uncomment this
  * 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,17 +143,17 @@
  *
  * 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/local/tcl/lib
+#define TclIncDir		/usr/local/tcl/include
+#define TclLibName		tcl80jp
 
 /*
  * By default, XF86Setup is linked with a static Tcl library.  To change
  * that, uncomment the following line.
  *
-#define XF86SetupUsesStaticTcl	NO
  */
+#define XF86SetupUsesStaticTcl	NO
 
 /*
  * Which servers do you wish to build, you can save a lot of disk space
@@ -163,12 +163,13 @@
  *
  * The following servers are supported in Intel x86 platforms
  *
-#define XF86SVGAServer          NO
-#define XF86VGA16Server         NO
-#define XF86VGA16DualServer	NO
+ */
+#define XF86SVGAServer          YES
+#define XF86VGA16Server         YES
+#define XF86VGA16DualServer	YES
 #define XF86MonoServer          NO
 #define XF86MonoDualServer	NO
-#define XF86S3Server            NO
+#define XF86S3Server            YES
 #define XF86S3VServer           NO
 #define XF86I8514Server         NO
 #define XF86Mach8Server         NO
@@ -180,7 +181,6 @@
 #define XF86I128Server		NO
 #define XF86GLINTServer		NO
 #define XF86FBDevServer		NO
- */
 
 /*
  * Which servers do you wish to build, you can save a lot of disk space
@@ -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
@@ -516,8 +516,8 @@
  * Could be used with gcc 'till Version 2.6.3
  * Should be used with gcc 2.7.2. 
  *
-#define UsePosix		YES
  */
+#define UsePosix		YES
 
 /*
  * If you want XDMAUTH support (if you have Wraphelp.c), uncomment this.