1 --- XFree86-3.3.4b/xc/config/cf/xf86site.def.rh Thu Jul 22 14:47:49 1999
2 +++ XFree86-3.3.4b/xc/config/cf/xf86site.def Thu Jul 22 14:48:58 1999
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
80 * fonts once, if this is a first time install you will want to build the
83 -#define BuildFonts NO
85 +#define BuildFonts YES
88 * To not build/install the 75dpi fonts, uncomment the following
91 * To not build/install the Cyrillic fonts, uncomment the following
93 -#define BuildCyrillicFonts NO
95 +#define BuildCyrillicFonts YES
98 * To not install the local font directory, uncomment the following
100 * will need to be built with the Joystick driver in order to be able to
103 -#define JoystickSupport NO
104 +#define JoystickSupport YES
105 #define WacomSupport YES
106 #define MicroTouchSupport YES
107 #define ElographicsSupport YES
109 * To forceably build static libraries in addition to shared libraries,
112 -#define ForceNormalLib YES
114 +#define ForceNormalLib YES
117 * Uncomment this if your default tools (eg, gcc, ld, as, etc) are
118 --- XFree86-3.3.4b/xc/config/cf/site.def.rh Sun Jun 22 06:32:21 1997
119 +++ XFree86-3.3.4b/xc/config/cf/site.def Thu Jul 22 14:48:58 1999
120 @@ -106,10 +106,11 @@
124 -#undef DefaultUserPath
125 -#define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin
128 +#undef DefaultUserPath
129 +#define DefaultUserPath /usr/local/bin:/bin:/usr/bin
130 +#undef DefaultSystemPath
131 +#define DefaultSystemPath /sbin:/usr/sbin:/bin:/usr/bin
133 /* You do NOT need SetUID if you only run the server under xdm */
134 /* You MAY need SetUID if users run the server by hand or under xinit */
135 --- XFree86-3.3.4b/xc/config/cf/linux.cf.rh Thu Jul 22 14:48:53 1999
136 +++ XFree86-3.3.4b/xc/config/cf/linux.cf Thu Jul 22 14:53:28 1999
138 #define HasMkstemp YES
145 #define AvoidNullMakeCommand YES
148 #include <lnxLib.rules>
149 #include <xfree86.cf>
151 +#ifndef XtermWithI18N
152 +#define XtermWithI18N YES
154 --- XFree86-3.3.4b/xc/programs/xinit/Imakefile.rh Thu Nov 5 14:28:39 1998
155 +++ XFree86-3.3.4b/xc/programs/xinit/Imakefile Thu Jul 22 14:48:58 1999
157 InstallNamedProg(startx,startx,$(BINDIR))
158 InstallManPage(startx,$(MANDIR))
160 -#if InstallXinitConfig
161 -InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
163 -InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
165 +XCOMM Red Hat gets this from a different package
166 +XCOMM #if InstallXinitConfig
167 +XCOMM InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
169 +XCOMM InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))