1 --- XFree86-3.3.3/xc/config/cf/xf86site.def.rh Sun Nov 8 06:19:11 1998
2 +++ XFree86-3.3.3/xc/config/cf/xf86site.def Mon Nov 30 13:48:39 1998
5 * This should automatically get set correctly by imake.
7 -#define LinuxCLibMajorVersion 5
8 -#define LinuxClibMinorVersion 4
10 +#define LinuxCLibMajorVersion 6
11 +#define LinuxClibMinorVersion 0
14 * If you want to use the GNU malloc library, uncomment this
16 * Note: version 4.0 or 4.1 is required, and XF86Setup links it statically by
24 * Set the paths and names for your Tk library if they don't match the
27 * Some Linux releases need TkLibDir set to /usr/X11R6/lib
29 -#define TkLibDir /usr/local/lib
30 -#define TkIncDir /usr/local/include
33 +#define TkLibDir /usr/lib
34 +#define TkIncDir /usr/include
38 * By default, XF86Setup is linked with a static Tk library. To change
39 * that, uncomment the following line.
41 -#define XF86SetupUsesStaticTk NO
43 +#define XF86SetupUsesStaticTk NO
47 * If you have Tcl (which is required to build XF86Setup), uncomment this
48 * Note: version 7.4 or 7.5 is required, and XF86Setup links it statically by
56 * Set the paths and names for your Tcl library if they don't match the
59 * Some Linux releases need TclIncDir set to /usr/include/tcl.
61 -#define TclLibDir /usr/local/lib
62 -#define TclIncDir /usr/local/include
63 -#define TclLibName tcl
65 +#define TclLibDir /usr/lib
66 +#define TclIncDir /usr/include
67 +#define TclLibName tcl
70 * By default, XF86Setup is linked with a static Tcl library. To change
71 * that, uncomment the following line.
73 -#define XF86SetupUsesStaticTcl NO
75 +#define XF86SetupUsesStaticTcl NO
78 * Which servers do you wish to build, you can save a lot of disk space
81 * To not build/install the Cyrillic fonts, uncomment the following
83 -#define BuildCyrillicFonts NO
85 +#define BuildCyrillicFonts YES
88 * To not install the local font directory, uncomment the following
90 * will need to be built with the Joystick driver in order to be able to
93 -#define JoystickSupport NO
94 +#define JoystickSupport YES
95 #define WacomSupport YES
96 #define MicroTouchSupport YES
97 #define ElographicsSupport YES
99 * To forceably build static libraries in addition to shared libraries,
102 -#define ForceNormalLib YES
104 +#define ForceNormalLib YES
107 * Uncomment this if your default tools (eg, gcc, ld, as, etc) are
108 --- XFree86-3.3.3/xc/config/cf/site.def.rh Sun Jun 22 06:32:21 1997
109 +++ XFree86-3.3.3/xc/config/cf/site.def Mon Nov 30 13:43:48 1998
110 @@ -106,10 +111,11 @@
114 -#undef DefaultUserPath
115 -#define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin
118 +#undef DefaultUserPath
119 +#define DefaultUserPath /usr/local/bin:/bin:/usr/bin
120 +#undef DefaultSystemPath
121 +#define DefaultSystemPath /sbin:/usr/sbin:/bin:/usr/bin
123 /* You do NOT need SetUID if you only run the server under xdm */
124 /* You MAY need SetUID if users run the server by hand or under xinit */
125 --- XFree86-3.3.3/xc/config/cf/linux.cf.rh Sun Nov 8 06:34:50 1998
126 +++ XFree86-3.3.3/xc/config/cf/linux.cf Mon Nov 30 13:43:53 1998
128 #include <xfree86.cf>
130 +#ifndef XtermWithI18N
131 +#define XtermWithI18N YES
133 --- XFree86-3.3.3/xc/programs/xinit/Imakefile.rh Thu Nov 5 14:28:39 1998
134 +++ XFree86-3.3.3/xc/programs/xinit/Imakefile Mon Nov 30 13:43:47 1998
136 InstallNamedProg(startx,startx,$(BINDIR))
137 InstallManPage(startx,$(MANDIR))
139 -#if InstallXinitConfig
140 -InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
142 -InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
144 +XCOMM Red Hat gets this from a different package
145 +XCOMM #if InstallXinitConfig
146 +XCOMM InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
148 +XCOMM InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))