aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/config/cf
diff options
context:
space:
mode:
Diffstat (limited to 'nx-X11/config/cf')
-rw-r--r--nx-X11/config/cf/README5
-rw-r--r--nx-X11/config/cf/X11.tmpl152
-rw-r--r--nx-X11/config/cf/linux.cf4
-rw-r--r--nx-X11/config/cf/xorg.cf31
4 files changed, 26 insertions, 166 deletions
diff --git a/nx-X11/config/cf/README b/nx-X11/config/cf/README
index 3e1fe95a3..0faa34ae7 100644
--- a/nx-X11/config/cf/README
+++ b/nx-X11/config/cf/README
@@ -172,15 +172,10 @@ X11.tmpl provides defaults for the following variables:
BDFTOSNFFILT command to run bdftosnf
BaseExtensionDefines universal extensions to use
BinDir directory in which to install programs
- BuildAppgroup build AppGroup extension in server
- BuildCup build Colormap Utilization extension in server
BuildDBE build DOUBLE-BUFFER extension
- BuildDmx build Distributed Multihead X server and extension
BuildDPMS build Display Power Management Signaling extension
BuildIncRoot relative path to location of headers in build
BuildIncTop path from build includes directory to top
- BuildEVI build EVI server extension
- BuildMultibuffer build Multibuffer extension (obsolete)
BuildPlugin build xrx plug-in for web browsers
BuildRECORD Build RECORD extension
BuildServer build X server
diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl
index f02f80786..89b069772 100644
--- a/nx-X11/config/cf/X11.tmpl
+++ b/nx-X11/config/cf/X11.tmpl
@@ -157,9 +157,6 @@ XORGRELSTRING = XorgManVersionString
#define BuildXauLib (BuildLibraries || BuildLibrariesForXServers)
#endif
#define UseInstalledXauLib (defined(UseInstalled) || !BuildXauLib)
-#ifndef BuildMITMiscExt
-#define BuildMITMiscExt YES
-#endif
#ifndef BuildTestExt
#define BuildTestExt YES
#endif
@@ -178,21 +175,12 @@ XORGRELSTRING = XorgManVersionString
#ifndef BuildXInputExt
#define BuildXInputExt NO
#endif
-#ifndef BuildEVI
-#define BuildEVI YES
-#endif
#ifndef BuildDBE
#define BuildDBE YES
#endif
-#ifndef BuildDIS
-#define BuildDIS NO
-#endif
#ifndef BuildDPMS
#define BuildDPMS YES
#endif
-#ifndef BuildFontCache
-#define BuildFontCache NO
-#endif
#ifndef BuildXKB
#define BuildXKB YES
#endif
@@ -202,9 +190,6 @@ XORGRELSTRING = XorgManVersionString
#ifndef BuildXKBfilelib
#define BuildXKBfilelib (BuildXKB && !BuildServersOnly)
#endif
-#ifndef BuildXTrap
-#define BuildXTrap YES
-#endif
/*
* WARNING: Setting UseXKBInClients to YES cause incompatibilities
@@ -214,9 +199,6 @@ XORGRELSTRING = XorgManVersionString
#ifndef UseXKBInClients
#define UseXKBInClients NO /* use XKB in "normal" clients? */
#endif
-#ifndef BuildMultibuffer
-#define BuildMultibuffer NO
-#endif
#ifndef BuildRECORD
#define BuildRECORD YES
#endif
@@ -229,15 +211,6 @@ XORGRELSTRING = XorgManVersionString
#ifndef BuildXCSecurity
#define BuildXCSecurity YES
#endif
-#ifndef BuildAppgroup
-#define BuildAppgroup YES
-#endif
-#if BuildAppgroup && !BuildXCSecurity
-#define BuildXCSecurity YES
-#endif
-#ifndef BuildCup
-#define BuildCup YES
-#endif
#ifndef HasPlugin
/* Browser plugins are shared libraries - only build them if the OS
* supports shared libs.
@@ -251,18 +224,9 @@ XORGRELSTRING = XorgManVersionString
#ifndef BuildScreenSaverExt
#define BuildScreenSaverExt NO
#endif
-#ifndef BuildXF86VidModeExt
-#define BuildXF86VidModeExt NO
-#endif
-#ifndef BuildXF86MiscExt
-#define BuildXF86MiscExt NO
-#endif
#ifndef BuildXF86BigfontExt
#define BuildXF86BigfontExt NO
#endif
-#ifndef BuildXF86DGA
-#define BuildXF86DGA NO
-#endif
#ifndef BuildXResExt
#define BuildXResExt NO
#endif
@@ -301,10 +265,6 @@ XORGRELSTRING = XorgManVersionString
#define BuildCompositeLibrary !BuildServersOnly && BuildXfixesLibrary
#endif
-#ifndef BuildXevie
-#define BuildXevie YES
-#endif
-
#ifndef BuildRootless
#define BuildRootless NO
#endif
@@ -459,13 +419,6 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
#endif
#ifndef ExtensionDefines
-#ifndef MITMiscDefines
-#if BuildMITMiscExt
-#define MITMiscDefines -DMITMISC
-#else
-#define MITMiscDefines /**/
-#endif
-#endif
#ifndef XTestDefines
#if BuildTestExt
#define XTestDefines -DXTEST
@@ -473,13 +426,6 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
#define XTestDefines /**/
#endif
#endif
-#ifndef XTrapDefines
-#if BuildXTrap
-#define XTrapDefines -DXTRAP
-#else
-#define XTrapDefines /**/
-#endif
-#endif
#ifndef XSyncDefines
#if BuildSyncExt
#define XSyncDefines -DXSYNC
@@ -573,14 +519,6 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
#endif
#endif
-#ifndef EVIDefines
-#if BuildEVI
-#define EVIDefines -DEVI
-#else
-#define EVIDefines /**/
-#endif
-#endif
-
#ifndef DBEDefines
#if BuildDBE
#define DBEDefines -DDBE
@@ -593,14 +531,6 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
#define PervasiveDBEDefines /* -DNEED_DBE_BUF_BITS -DNEED_DBE_BUF_VALIDATE */
#endif
-#ifndef MultibufferDefines
-#if BuildMultibuffer
-#define MultibufferDefines -DMULTIBUFFER
-#else
-#define MultibufferDefines /**/
-#endif
-#endif
-
#ifndef ScreenSaverExtensionDefines
#if BuildScreenSaverExt
#define ScreenSaverExtensionDefines -DSCREENSAVER
@@ -608,20 +538,6 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
#define ScreenSaverExtensionDefines /**/
#endif
#endif
-#ifndef VidModeExtensionDefines
-#if BuildXF86VidModeExt
-#define VidModeExtensionDefines -DXF86VIDMODE
-#else
-#define VidModeExtensionDefines /**/
-#endif
-#endif
-#ifndef XF86MiscExtensionDefines
-#if BuildXF86MiscExt
-#define XF86MiscExtensionDefines -DXF86MISC
-#else
-#define XF86MiscExtensionDefines /**/
-#endif
-#endif
#ifndef XF86BigfontExtensionDefines
#if BuildXF86BigfontExt
@@ -663,14 +579,6 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
#endif
#endif
-#ifndef AppgroupDefines
-#if BuildAppgroup
-#define AppgroupDefines -DXAPPGROUP
-#else
-#define AppgroupDefines /**/
-#endif
-#endif
-
#ifndef XCSecurityDefines
#if BuildXCSecurity
#define XCSecurityDefines -DXCSECURITY
@@ -679,14 +587,6 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
#endif
#endif
-#ifndef CupDefines
-#if BuildCup
-#define CupDefines -DTOGCUP
-#else
-#define CupDefines /**/
-#endif
-#endif
-
#ifndef DPMSDefines
#if BuildDPMS
#define DPMSDefines -DDPMSExtension
@@ -711,14 +611,6 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
#endif
#endif
-#ifndef FontCacheExtentionDefines
-#if BuildFontCache
-#define FontCacheExtensionDefines -DFONTCACHE
-#else
-#define FontCacheExtensionDefines /**/
-#endif
-#endif
-
#ifndef XfixesDefines
#if BuildXfixes
#define XfixesDefines -DXFIXES
@@ -743,14 +635,6 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
#endif
#endif
-#ifndef XevieDefines
-#if BuildXevie
-#define XevieDefines -DXEVIE
-#else
-#define XevieDefines /**/
-#endif
-#endif
-
#ifndef RootlessDefines
#if BuildRootless
#define RootlessDefines -DROOTLESS
@@ -764,12 +648,20 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
#endif
#ifndef PervasiveExtensionDefines
#define PervasiveExtensionDefines \
- ShapeDefines XInputDefines XkbDefines AppgroupDefines \
- XCSecurityDefines CupDefines PervasiveDBEDefines \
- XF86BigfontExtensionDefines DPMSDefines \
+ PervasiveDBEDefines \
+ ShapeDefines \
+ XInputDefines \
+ XkbDefines \
+ XCSecurityDefines \
+ XF86BigfontExtensionDefines \
+ DPMSDefines \
+ SitePervasiveExtensionDefines \
+ RenderDefines \
+ RandRDefines \
XineramaDefines \
- SitePervasiveExtensionDefines RenderDefines RandRDefines \
- XfixesDefines XDamageDefines CompositeDefines XevieDefines \
+ XfixesDefines \
+ XDamageDefines \
+ CompositeDefines \
RootlessDefines
#endif
#ifndef SiteExtensionDefines
@@ -777,12 +669,18 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
#endif
#ifndef BaseExtensionDefines
#define BaseExtensionDefines \
- MultibufferDefines MITMiscDefines XTestDefines XTrapDefines \
- XSyncDefines XCMiscDefines RECORDDefines \
- ShmDefines BigReqDefines VidModeExtensionDefines \
- XF86MiscExtensionDefines DBEDefines DPMSDefines EVIDefines \
- ScreenSaverExtensionDefines XvExtensionDefines XvMCExtensionDefines \
- GlxDefines FontCacheExtensionDefines SiteExtensionDefines \
+ DBEDefines \
+ XTestDefines \
+ XSyncDefines \
+ RECORDDefines \
+ ShmDefines \
+ BigReqDefines \
+ DPMSDefines \
+ ScreenSaverExtensionDefines \
+ XvExtensionDefines \
+ XvMCExtensionDefines \
+ GlxDefines \
+ SiteExtensionDefines \
XResExtensionDefines
#endif
#define ExtensionDefines BaseExtensionDefines ExtensionOSDefines
diff --git a/nx-X11/config/cf/linux.cf b/nx-X11/config/cf/linux.cf
index d1f930123..3ff1f5b7d 100644
--- a/nx-X11/config/cf/linux.cf
+++ b/nx-X11/config/cf/linux.cf
@@ -944,10 +944,6 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
# endif
#endif
-#ifndef BuildDmx
-#define BuildDmx YES
-#endif
-
#include <lnxLib.rules>
# include <xorg.cf>
diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf
index a6eaddc72..54ca00bc5 100644
--- a/nx-X11/config/cf/xorg.cf
+++ b/nx-X11/config/cf/xorg.cf
@@ -472,21 +472,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
#endif
/*
- * Build the XFree86-VidMode extension
- */
-#ifndef BuildXF86VidModeExt
-# define BuildXF86VidModeExt YES
-#endif
-
-/* Don't build this now because the interface hasn't been done yet */
-/*
- * Build the XFree86-Misc extension
- */
-#ifndef BuildXF86MiscExt
-# define BuildXF86MiscExt YES
-#endif
-
-/*
* Build the XFree86-Bigfont extension
*/
#ifndef BuildXF86BigfontExt
@@ -494,13 +479,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
#endif
/*
- * Build the XFree86 DGA support
- */
-#ifndef BuildXF86DGA
-# define BuildXF86DGA YES
-#endif
-
-/*
* Build the DPMS extension support
*/
#ifndef BuildDPMSExt
@@ -576,12 +554,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
#define InstallJapaneseDocs NO
#endif
-#if BuildXF86DGA
-# define XFree86DGADefines -DXFreeXDGA
-#else
-# define XFree86DGADefines /**/
-#endif
-
#if BuildXvExt
# define XFree86XvDefines -DXvExtension
#else
@@ -643,9 +615,8 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
/* Server defines required for all OSs */
#ifndef XFree86ServerDefines
# define XFree86ServerDefines -DAVOID_GLYPHBLT -DPIXPRIV -DSINGLEDEPTH \
- XFree86DGADefines XFree86XvDefines \
+ XFree86XvDefines \
XFree86LoaderDefines -DXFree86Server \
- VidModeExtensionDefines \
XFree86XvMCDefines \
SmartScheduleDefines \
DebugDefines XFree86XResDefines \