diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2015-04-28 05:15:19 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2015-04-28 05:15:19 +0200 |
| commit | 7b7ba9441b3ff72f0e963221342dcccbafc04312 (patch) | |
| tree | f718af7b85c4a17a28eb12f81922b1e3d1eb6481 /nx-X11/config/cf/xfree86.cf | |
| parent | cbf4e4dbebaca561ff2ff98521e249b9eac046ab (diff) | |
| parent | 662a89545f3e953a47f176cf64e574350643d446 (diff) | |
| download | nx-libs-7b7ba9441b3ff72f0e963221342dcccbafc04312.tar.gz nx-libs-7b7ba9441b3ff72f0e963221342dcccbafc04312.tar.bz2 nx-libs-7b7ba9441b3ff72f0e963221342dcccbafc04312.zip | |
Merge branch 'sunweaver-pr/imake-cleanup-nonpresent-buildlogic' into arctica-3.6.x
Attributes GH PR #17: https://github.com/ArcticaProject/nx-libs/pull/17
Diffstat (limited to 'nx-X11/config/cf/xfree86.cf')
| -rw-r--r-- | nx-X11/config/cf/xfree86.cf | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/nx-X11/config/cf/xfree86.cf b/nx-X11/config/cf/xfree86.cf index 41790c019..dea9b74b5 100644 --- a/nx-X11/config/cf/xfree86.cf +++ b/nx-X11/config/cf/xfree86.cf @@ -234,45 +234,6 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ #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 - -/* * For Intel platforms, the default is to build all modules which * are supported on this platform. */ @@ -1304,16 +1265,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 */ @@ -1538,10 +1489,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 # define BuildXF86RushExt NO #endif -#ifndef BuildDBElib -# define BuildDBElib YES -#endif - #ifndef BuildRECORDlib # define BuildRECORDlib YES #endif @@ -1582,9 +1529,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 @@ -1594,12 +1538,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 |