diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-03-03 12:13:59 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-04-04 10:53:05 +0200 |
| commit | 6471f66c99864dd95a7c4f866825fcb9f8fd3a33 (patch) | |
| tree | ad929a096538c0708641e1b5dc37930f857b4548 /nx-X11/config/cf | |
| parent | 9c46d3ddb4394126408a557af98ea9766c554059 (diff) | |
| download | nx-libs-6471f66c99864dd95a7c4f866825fcb9f8fd3a33.tar.gz nx-libs-6471f66c99864dd95a7c4f866825fcb9f8fd3a33.tar.bz2 nx-libs-6471f66c99864dd95a7c4f866825fcb9f8fd3a33.zip | |
imake cleanup: Drop all references to XNestServer.
Diffstat (limited to 'nx-X11/config/cf')
| -rw-r--r-- | nx-X11/config/cf/README | 1 | ||||
| -rw-r--r-- | nx-X11/config/cf/X11.tmpl | 4 | ||||
| -rw-r--r-- | nx-X11/config/cf/host.def | 10 | ||||
| -rw-r--r-- | nx-X11/config/cf/xf86site.def | 6 | ||||
| -rw-r--r-- | nx-X11/config/cf/xfree86.cf | 3 | ||||
| -rw-r--r-- | nx-X11/config/cf/xorg.cf | 3 | ||||
| -rw-r--r-- | nx-X11/config/cf/xorgsite.def | 6 |
7 files changed, 3 insertions, 30 deletions
diff --git a/nx-X11/config/cf/README b/nx-X11/config/cf/README index c4c5f59ab..762dce44c 100644 --- a/nx-X11/config/cf/README +++ b/nx-X11/config/cf/README @@ -461,7 +461,6 @@ The following variables are used by some part of the tree: SvgaConfig default SVGA configuration HasGetReturnAddress util/memleak HasShadowPasswd system has getspnam() function - XnestServer build X server with Xlib-based ddx XVirtualFramebufferServer build X server with virtual memory framebuffer WebServer host:port of your Web server (see programs/xrx) HtmlDir path used by Web server for HTML and RX docs diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl index 4600f1824..7321843a7 100644 --- a/nx-X11/config/cf/X11.tmpl +++ b/nx-X11/config/cf/X11.tmpl @@ -386,7 +386,7 @@ XORGRELSTRING = XorgManVersionString #else #define BuildFontLib (BuildLibraries || \ (BuildServer && !DoLoadableServer) || \ - XnestServer || XVirtualFramebufferServer || \ + XVirtualFramebufferServer || \ XprtServer || XdmxServer) #endif #endif @@ -420,7 +420,7 @@ XORGRELSTRING = XorgManVersionString #endif #ifndef BuildXKBlib #define BuildXKBlib (BuildXKB && (!BuildServersOnly || \ - XnestServer || XdmxServer || \ + XdmxServer || \ BuildXkbcomp )) #endif #ifndef BuildXKBuilib diff --git a/nx-X11/config/cf/host.def b/nx-X11/config/cf/host.def index 1d03cf03f..1f70509dd 100644 --- a/nx-X11/config/cf/host.def +++ b/nx-X11/config/cf/host.def @@ -76,13 +76,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ #define XorgServer NO /* - * To disable building the Xnest server, uncomment this. - * -#define XnestServer NO - */ -#define XnestServer NO - -/* * To disable building Xvfb, uncomment this. * #define XVirtualFramebufferServer NO @@ -167,7 +160,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ * #define BuildLibrariesForXServers YES */ -#if XnestServer || NXAgentServer +#if NXAgentServer #define BuildLibraries YES #endif @@ -972,7 +965,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ #define DefaultRGBDatabase /usr/NX/share/rgb #define XprtServer NO #define BuildXprint NO -#define XnestServer NO #define XVirtualFramebufferServer NO #define BuildFontServer NO #define BuildFreeType NO diff --git a/nx-X11/config/cf/xf86site.def b/nx-X11/config/cf/xf86site.def index d445c1c72..6fc5e66b6 100644 --- a/nx-X11/config/cf/xf86site.def +++ b/nx-X11/config/cf/xf86site.def @@ -45,12 +45,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ */ /* - * To disable building the Xnest server, uncomment this. - * -#define XnestServer NO - */ - -/* * To disable building Xvfb, uncomment this. * #define XVirtualFramebufferServer NO diff --git a/nx-X11/config/cf/xfree86.cf b/nx-X11/config/cf/xfree86.cf index f7c151c41..306586d92 100644 --- a/nx-X11/config/cf/xfree86.cf +++ b/nx-X11/config/cf/xfree86.cf @@ -1876,9 +1876,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 # define UseServerLock YES #endif -#ifndef XnestServer -# define XnestServer YES -#endif #ifndef XVirtualFramebufferServer # define XVirtualFramebufferServer YES #endif diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf index 71dab5631..17fcb7aad 100644 --- a/nx-X11/config/cf/xorg.cf +++ b/nx-X11/config/cf/xorg.cf @@ -1441,9 +1441,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 # define UseServerLock YES #endif -#ifndef XnestServer -# define XnestServer YES -#endif #ifndef XVirtualFramebufferServer # define XVirtualFramebufferServer YES #endif diff --git a/nx-X11/config/cf/xorgsite.def b/nx-X11/config/cf/xorgsite.def index dea5ceb92..db4a1e490 100644 --- a/nx-X11/config/cf/xorgsite.def +++ b/nx-X11/config/cf/xorgsite.def @@ -45,12 +45,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ */ /* - * To disable building the Xnest server, uncomment this. - * -#define XnestServer NO - */ - -/* * To disable building Xvfb, uncomment this. * #define XVirtualFramebufferServer NO |