diff options
Diffstat (limited to 'nx-X11/config/cf/xorg.cf')
| -rw-r--r-- | nx-X11/config/cf/xorg.cf | 128 |
1 files changed, 0 insertions, 128 deletions
diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf index 71dab5631..d4ef89fd4 100644 --- a/nx-X11/config/cf/xorg.cf +++ b/nx-X11/config/cf/xorg.cf @@ -288,45 +288,6 @@ NX_VERSION_CURRENT_STRING = nxVersionString #endif /* - * There are three parameters that determine where and how the Matrox HAL - * library is used: - * - * HaveMatroxHal -- You have the HALlib.a binary library installed - * in xfree86/drivers/mga/HALlib, and you want it to - * be used. - * Default: NO - * - * BuildMatroxHal -- You have the source for the HALlib library (installed - * in xfree86/drivers/mga/hallib), and want to build and - * use it. - * Default: NO - * - * UseMatroxHal -- You want to build support for loading/using the HAL - * library into the mga driver. For module server builds - * you don't need to have the HALlib library to do this. - * but you want to build support for loading it and using - * it into the mga driver module. - * Default: YES for loadable server build - * (HaveMatroxHal || BuildMatroxHal) for static - */ - -#ifndef HaveMatroxHal -#define HaveMatroxHal NO -#endif - -#ifndef BuildMatroxHal -#define BuildMatroxHal NO -#endif - -#ifndef UseMatroxHal -#if DoLoadableServer -#define UseMatroxHal YES -#else -#define UseMatroxHal (HaveMatroxHal || BuildMatroxHal) -#endif -#endif - -/* * Many architectures share common X Server pieces. List them here. */ #if defined(i386Architecture) || defined(ia64Architecture) || \ @@ -860,16 +821,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 #endif /* - * The default is to install the X servers setuid-root on most OSs. - * It the servers are only started by xdm, they should not be setuid-root. - */ -#if !defined(i386MachArchitecture) && !defined(OS2Architecture) -# ifndef InstallXserverSetUID -# define InstallXserverSetUID YES -# endif -#endif - -/* * Build GLX server interface * --- Doesn't work for 1-bit and 4-bit servers */ @@ -1102,10 +1053,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 # define BuildXF86RushExt NO #endif -#ifndef BuildDBElib -# define BuildDBElib YES -#endif - #ifndef BuildRECORDlib # define BuildRECORDlib YES #endif @@ -1146,9 +1093,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 * Build the extra extension libs even when not including the extra extensions * in the servers */ -#ifndef BuildScreenSaverLibrary -# define BuildScreenSaverLibrary YES -#endif #ifndef BuildXF86MiscLibrary # define BuildXF86MiscLibrary YES #endif @@ -1158,12 +1102,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 #ifndef BuildXF86VidModeLibrary # define BuildXF86VidModeLibrary YES #endif -#ifndef BuildXvLibrary -# define BuildXvLibrary YES -#endif -#ifndef BuildXvMCLibrary -# define BuildXvMCLibrary YES -#endif #ifndef BuildGLXLibrary # define BuildGLXLibrary YES #endif @@ -1248,57 +1186,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 #endif /* - * Build the font server - */ -#ifndef BuildFontServer -# define BuildFontServer YES -#endif - -/* - * Include fonts support - */ -#ifndef BuildSpeedo -# define BuildSpeedo NO -#endif - -#ifndef BuildType1 -# define BuildType1 NO -#endif - -#ifndef BuildCID -# define BuildCID YES -#endif - -#ifndef BuildFreeType -# define BuildFreeType YES -#endif - -/* - * By default, build all of the fonts. - */ -#ifndef Build75DpiFonts -# define Build75DpiFonts YES -#endif -#ifndef Build100DpiFonts -# define Build100DpiFonts YES -#endif -#ifndef BuildSpeedoFonts -# define BuildSpeedoFonts NO -#endif -#ifndef BuildType1Fonts -# define BuildType1Fonts YES -#endif -#ifndef BuildCIDFonts -# define BuildCIDFonts YES -#endif -#ifndef BuildTrueTypeFonts -# define BuildTrueTypeFonts YES -#endif -#ifndef BuildCyrillicFonts -# define BuildCyrillicFonts YES -#endif - -/* * Build scanpci? */ #ifndef SystemV @@ -1319,14 +1206,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 # endif #endif -#ifndef CompressAllFonts -# define CompressAllFonts YES -#endif - -#ifndef GzipFontCompression -# define GzipFontCompression YES -#endif - /* Disable stripping installed programs for this release. */ #ifndef StripInstalledPrograms # define StripInstalledPrograms NO @@ -1441,13 +1320,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 # define UseServerLock YES #endif -#ifndef XnestServer -# define XnestServer YES -#endif -#ifndef XVirtualFramebufferServer -# define XVirtualFramebufferServer YES -#endif - #ifndef ServerExtraDefines # define ServerExtraDefines XFree86ServerDefines #endif |