Merge branch 'feature/other-Xserver-cleanup' into arctica-3.6.x

Attributes GH PR #8: https://github.com/ArcticaProject/nx-libs/pull/8

7 files changed, 9 insertions, 304 deletions

diff --git a/nx-X11/config/cf/README b/nx-X11/config/cf/README
index c4c5f59ab..a31490377 100644
--- a/nx-X11/config/cf/README
+++ b/nx-X11/config/cf/README
@@ -178,7 +178,6 @@ X11.tmpl provides defaults for the following variables:
 	BuildDBE		build DOUBLE-BUFFER extension
 	BuildDmx		build Distributed Multihead X server and extension
 	BuildDPMS		build Display Power Management Signaling extension
-	BuildFontServer		build font server
 	BuildFonts		build pcf fonts
 	BuildIncRoot		relative path to location of headers in build
 	BuildIncTop		path from build includes directory to top
@@ -325,14 +324,6 @@ X11.tmpl provides defaults for the following variables:
 	XdmDir			directory in which to install xdm files
 	XdmServersType		type of xdm Xservers file to install
 	XinitDir		directory in which to install xinit files
-	XPrintDir		parent of X Print server config directory
-	XprtServer		build the X Print server
-	XpRasterDDX		include the raster print ddx driver
-	XpColorPclDDX		include the color PCL print ddx driver
-	XpMonoPclDDX		include the monochrome PCL print ddx driver
-	XpPostScriptDDX		include the PostScript print ddx driver
-	XpPdfDDX		include the PDF print ddx driver
-	XpSvgDDX		include the SVG print ddx driver
 	XmanLocalSearchPath	non-standard path for man pages
 	XtErrorPrefix		leading text in XtError() msg; eg. 'X Toolkit '
 	XtWarningPrefix		leading text in XtWarning()msg, same as above
@@ -461,13 +452,10 @@ 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
 	CgiBinDir		path used by Web server for CGI programs
 	ProxyManager		ICE network ID to contact a running proxymngr
-	XdmxServer		build Distributed Multihead X server
 
 
 Make Variables
diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl
index 4600f1824..b6ff72e1f 100644
--- a/nx-X11/config/cf/X11.tmpl
+++ b/nx-X11/config/cf/X11.tmpl
@@ -138,25 +138,12 @@ XORGRELSTRING = XorgManVersionString
 #ifndef BuildDocs
 #define BuildDocs		!BuildServersOnly
 #endif
-#ifndef BuildDmx
-#define BuildDmx		NO
-#endif
-#ifndef XdmxServer
-#define XdmxServer		BuildDmx
-#endif
-#ifndef BuildLibrariesForDmx
-#define BuildLibrariesForDmx	XdmxServer
-#endif
 #ifndef BuildLibraries
-#define BuildLibraries		(!BuildServersOnly || BuildClients || \
-				 BuildLibrariesForDmx)
+#define BuildLibraries		(!BuildServersOnly || BuildClients)
 #endif
 #ifndef BuildLibrariesForXServers
 #define BuildLibrariesForXServers	BuildServer
 #endif
-#ifndef BuildFontServer
-#define BuildFontServer		YES
-#endif
 #ifndef XserverStaticFontLib
 #define XserverStaticFontLib	YES
 #endif
@@ -176,7 +163,7 @@ XORGRELSTRING = XorgManVersionString
 #define BuildBuiltinFonts	NO
 #endif
 #ifndef BuildFonts
-#define BuildFonts		(BuildServer | BuildFontServer)
+#define BuildFonts		BuildServer
 #endif
 #ifndef Build75DpiFonts
 #define Build75DpiFonts		YES
@@ -362,8 +349,7 @@ XORGRELSTRING = XorgManVersionString
 #define BuildXInputExt		NO
 #endif
 #ifndef BuildXInputLib
-#define BuildXInputLib		(BuildXInputExt && \
-				 (!BuildServersOnly || BuildLibrariesForDmx))
+#define BuildXInputLib		(BuildXInputExt && !BuildServersOnly)
 #endif
 #ifndef BuildEVI
 #define BuildEVI		YES
@@ -384,10 +370,7 @@ XORGRELSTRING = XorgManVersionString
 #if (!defined(XF86Server) || !XF86Server) && (!defined (XorgServer) || !XorgServer)
 #define BuildFontLib		(BuildLibraries || BuildServer)
 #else
-#define BuildFontLib		(BuildLibraries || \
-				 (BuildServer && !DoLoadableServer) || \
-				 XnestServer || XVirtualFramebufferServer || \
-				 XprtServer || XdmxServer)
+#define BuildFontLib		(BuildLibraries || (BuildServer && !DoLoadableServer))
 #endif
 #endif
 #ifndef BuildFontCache
@@ -420,7 +403,6 @@ XORGRELSTRING = XorgManVersionString
 #endif
 #ifndef BuildXKBlib
 #define BuildXKBlib		(BuildXKB && (!BuildServersOnly || \
-					      XnestServer || XdmxServer || \
 					      BuildXkbcomp ))
 #endif
 #ifndef BuildXKBuilib
@@ -460,13 +442,6 @@ XORGRELSTRING = XorgManVersionString
 #ifndef BuildXineramaLibrary
 #define BuildXineramaLibrary	(BuildXinerama)
 #endif
-#ifndef BuildDmxDevelTools
-#define BuildDmxDevelTools	NO
-#endif
-#ifndef BuildDmxLibrary
-#define BuildDmxLibrary		(BuildDmx && \
-				 (!BuildServersOnly || BuildDmxDevelTools))
-#endif
 #ifndef BuildXCSecurity
 #define BuildXCSecurity		YES
 #endif
@@ -507,19 +482,6 @@ XORGRELSTRING = XorgManVersionString
 #define XpSvgDDX                YES
 #endif
 
-#ifndef BuildXprint
-#define BuildXprint		YES
-#endif
-#ifndef XprtServer
-#define XprtServer		(BuildServer && BuildXprint)
-#endif
-#ifndef BuildXprintLib
-#define BuildXprintLib		(!BuildServersOnly && BuildXprint)
-#endif
-#ifndef BuildXprintClients
-#define BuildXprintClients	BuildXprintLib
-#endif
-
 #ifndef BuildScreenSaverExt
 #define BuildScreenSaverExt	NO
 #endif
@@ -551,8 +513,7 @@ XORGRELSTRING = XorgManVersionString
 #define BuildXResExt            NO
 #endif
 #ifndef BuildXResLibrary
-#define BuildXResLibrary        (BuildXResExt && \
-				 (!BuildServersOnly || BuildDmxDevelTools))
+#define BuildXResLibrary        (BuildXResExt && !BuildServersOnly)
 #endif
 #ifndef BuildXvExt
 #define BuildXvExt		NO
@@ -617,7 +578,7 @@ XORGRELSTRING = XorgManVersionString
 #define BuildRender		YES
 #endif
 #ifndef BuildRenderLibrary
-#define BuildRenderLibrary	(XdmxServer || !BuildServersOnly)
+#define BuildRenderLibrary	!BuildServersOnly
 #endif
 #ifndef BuildXftLibrary
 #define BuildXftLibrary		BuildRenderLibrary
@@ -1000,17 +961,6 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
 #ifndef PrintOnlyServer
 #define PrintOnlyServer YES
 #endif
-#ifndef XprintDefines
-#if BuildXprint
-#if PrintOnlyServer
-#define XprintDefines -DXPRINT -DPIXPRIV
-#else
-#define XprintDefines -DXPRINT -DLOADABLEPRINTDDX -DPIXPRIV
-#endif
-#else
-#define XprintDefines /**/
-#endif
-#endif
 #ifndef XkbDefines
 #if BuildXKB
 #define XkbDefines -DXKB
@@ -1243,7 +1193,7 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
 	ShapeDefines XInputDefines XkbDefines LbxDefines AppgroupDefines \
 	XCSecurityDefines CupDefines PervasiveDBEDefines \
 	XF86BigfontExtensionDefines DPMSDefines \
-	XprintDefines XineramaDefines \
+	XineramaDefines \
 	SitePervasiveExtensionDefines RenderDefines RandRDefines \
 	XfixesDefines XDamageDefines CompositeDefines XevieDefines \
 	RootlessDefines
@@ -1544,9 +1494,6 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
 #ifndef ServerConfigDir
 #define ServerConfigDir $(LIBDIR)/xserver
 #endif
-#ifndef XPrintDir
-#define XPrintDir ServerConfigDir
-#endif
 #ifndef EtcX11Directory
 #define EtcX11Directory /etc/X11
 #endif
@@ -1679,7 +1626,6 @@ XCOMM X Window System make variables; these need to be coordinated with rules
        XLOCALEDIR = XLocaleDir		/* locale files */
       LBXPROXYDIR = LbxproxyDir		/* lbxproxy files */
   PROXYMANAGERDIR = ProxyManagerDir	/* proxy manager config files */
-        XPRINTDIR = XPrintDir		/* print config file root */
       XAPPLOADDIR = XAppLoadDir		/* application default resource dir */
        FONTCFLAGS = FontCompilerFlags
 
@@ -1739,7 +1685,6 @@ XCOMM X Window System make variables; these need to be coordinated with rules
            RGBSRC = $(XTOP)/programs/rgb
       BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf
      MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir
-    FONTSERVERSRC = $(PROGRAMSRC)/xfs
        FONTINCSRC = $(XTOP)/include/fonts
         EXTINCSRC = $(XTOP)/include/extensions
       FTSOURCEDIR = FreeTypeSrcDir
@@ -2517,30 +2462,6 @@ SharedLibReferences(XXF86DGA,NX_Xxf86dga,$(XXF86DGALIBSRC),SOXXF86DGAREV,SharedX
 ProjectUnsharedLibReferences(XXF86DGA,NX_Xxf86dga,$(XXF86DGALIBSRC),XBuildLibDir)
 #endif
 
-#if BuildDmxLibrary
-#ifndef SharedLibDmx
-#define SharedLibDmx		NO
-#endif
-#ifndef NormalLibDmx
-#define NormalLibDmx		YES
-#endif
-#ifndef DebugLibDmx
-#define DebugLibDmx		NO
-#endif
-#ifndef ProfileLibDmx
-#define ProfileLibDmx		NO
-#endif
-#else /* BuildDmxLibrary */
-#undef SharedLibDmx
-#define SharedLibDmx		NO
-#undef NormalLibDmx
-#define NormalLibDmx		NO
-#undef DebugLibDmx
-#define DebugLibDmx		NO
-#undef ProfileLibDmx
-#define ProfileLibDmx		NO
-#endif /* BuildDmxLibrary */
-
     XXF86RUSHLIBSRC = $(LIBSRC)/Xxf86rush
 #if SharedLibXxf86rush
 #ifndef SharedXxf86rushRev
@@ -2593,16 +2514,6 @@ SharedLibReferences(XRES,NX_XRes,$(XRESLIBSRC),SOXRESREV,SharedXResRev)
 ProjectUnsharedLibReferences(XRES,NX_XRes,$(XRESLIBSRC),XBuildLibDir)
 #endif
 
-    DMXLIBSRC = $(LIBSRC)/dmx
-#if SharedLibDmx
-#ifndef SharedDmxRev
-#define SharedDmxRev 1.0
-#endif
-SharedLibReferences(DMX,NX_dmx,$(DMXLIBSRC),SODMXREV,SharedDmxRev)
-#else
-ProjectUnsharedLibReferences(DMX,NX_dmx,$(DMXLIBSRC),XBuildLibDir)
-#endif
-
     DPSLIBSRC = $(LIBSRC)/dps
 #if SharedLibDps
 #ifndef SharedDpsRev
@@ -2964,7 +2875,7 @@ UnsharedLibReferences(XA,NX_Xa,$(XALIBSRC))
 #endif
 
 #ifndef BuildXaw
-#define BuildXaw (BuildXprintLib && !BuildServersOnly)
+#define BuildXaw !BuildServersOnly
 #endif
 
        /* AWIDGETSRC is needed by libXaw6 and libXaw7 */
diff --git a/nx-X11/config/cf/host.def b/nx-X11/config/cf/host.def
index 9b482c620..a7ae46431 100644
--- a/nx-X11/config/cf/host.def
+++ b/nx-X11/config/cf/host.def
@@ -46,8 +46,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
 /*                                                                        */
 /**************************************************************************/
 
-#if !defined(NXZaurusXServer) && !defined(NXiPAQXServer) && !defined(DarwinArchitecture)
-
 #if defined(SunArchitecture)
 #define ProjectRoot /usr/openwin
 #endif
@@ -76,42 +74,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
- */
-#define XVirtualFramebufferServer	NO
-
-/*
- * To enable building Xdmx, uncomment this.
- *
-#define XdmxServer YES
- */
-#define XdmxServer NO
-
-/*
- * To disable building Xprt, uncomment this.
- *
-#define XprtServer NO
- */
-#define XprtServer NO
-
-/*
- * Xprint is needed by Xprt. You can disable it if
- * you are not going to build Xprt.
- *
-#define BuildXprint		NO
- */
-#define BuildXprint		NO
-
-/*
  * Building libraries with NX enhancements is disabled
  * by default. You should enable this in your host.def.
  *
@@ -149,7 +111,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
  */
 #if defined(cygwinArchitecture)
 #define NXWinServer             NO
-#define XWinServer              NO
 #endif
 
 /*
@@ -168,7 +129,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
 
@@ -287,13 +248,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
  */
 
 /*
- * To disable building the font server, uncomment this.
- *
-#define BuildFontServer		NO
- */
-#define BuildFontServer		NO
-
-/*
  * Speedo fonts have been disabled by default in this release.
  * To re-enable support for Speedo fonts, uncomment this.
  *
@@ -964,63 +918,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
 
 #define BuildXaw7              NO
 
-#else /* #if !defined(NXZaurusXServer) && !defined(NXiPAQXServer) && !defined(DarwinArchitecture) */
-
-#if defined(DarwinArchitecture) && !defined(NXZaurusXServer) && !defined(NXiPAQXServer)
-#define NXDarwinServer              NO
-#define BuildServersOnly            YES
-#define DefaultFontPath             /usr/NX/share/fonts/misc/,/usr/NX/share/fonts/TTF/
-#define DefaultRGBDatabase          /usr/NX/share/rgb
-#define XprtServer                  NO
-#define BuildXprint                 NO
-#define XnestServer                 NO
-#define XVirtualFramebufferServer   NO
-#define BuildFontServer             NO
-#define BuildFreeType               NO
-#define BuildXTrueType              NO
-#define FontLibSharedFreeType       YES
-#endif
-
-#if !defined(NXZaurusXServer) && defined(NXiPAQXServer)
-#define KDriveXServer               YES
-#define XiPAQH3500Server            YES
-#define BuildServersOnly            YES
-#define NXEmbeddedXServer           YES
-#define KdriveServerExtraDefines    -DITSY -DMAXSCREENS=1
-#define TinyXServer                 YES
-#define CrossCompiling              YES
-#define TouchScreen                 YES
-#define ItsyCompilerBug             YES
-#undef  BuildRandR
-#define BuildRandR                  YES
-#define BuildXInputLib              YES
-#define BuildXTrueType              YES
-#define ServerXdmcpDefines
-#define XipaqServer                 YES
-#endif
-
-#if !defined(NXiPAQXServer) && defined(NXZaurusXServer)
-#define KDriveXServer               YES
-#define XiPAQH3500Server            YES
-#define BuildServersOnly            YES
-#define ZaurusXServer               YES
-#define NXEmbeddedXServer           YES
-#define KdriveServerExtraDefines    -DITSY -DMAXSCREENS=1
-#define TinyXServer                 YES
-#define CrossCompiling              YES
-#define TouchScreen                 YES
-#define ItsyCompilerBug             YES
-#undef  BuildRandR
-#define BuildRandR                  YES
-#define BuildXInputLib              YES
-#define BuildXTrueType              YES
-#define ServerXdmcpDefines
-#define XipaqServer                 YES
-#define XfbdevServer                YES
-#endif
-
-#endif /* #if !defined(NXZaurusXServer) && !defined(NXiPAQXServer) && !defined(DarwinArchitecture) */
-
 #define BuildRman NO
 #define BuildFontEncLib NO
 #define BuildXcursorLibrary NO
diff --git a/nx-X11/config/cf/xf86site.def b/nx-X11/config/cf/xf86site.def
index d445c1c72..39d8980b6 100644
--- a/nx-X11/config/cf/xf86site.def
+++ b/nx-X11/config/cf/xf86site.def
@@ -45,30 +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
- */
-
-/*
- * To enable building Xdmx, uncomment this.
- *
-#define XdmxServer		YES
- */
-
-/*
- * To disable building Xprt, uncomment this.
- *
-#define XprtServer NO
- */
-
-/*
  * Set the default server (ie the one that gets the sym-link to "X")
  *
 #define ServerToInstall		XFree86
@@ -163,12 +139,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
  */
 
 /*
- * To disable building the font server, uncomment this.
- *
-#define BuildFontServer		NO
- */
-
-/*
  * To disable support for Speedo fonts, uncomment this.
  *
 #define BuildSpeedo		NO
diff --git a/nx-X11/config/cf/xfree86.cf b/nx-X11/config/cf/xfree86.cf
index f7c151c41..0348c0302 100644
--- a/nx-X11/config/cf/xfree86.cf
+++ b/nx-X11/config/cf/xfree86.cf
@@ -1684,13 +1684,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
 #endif
 
 /*
- * Build the font server
- */
-#ifndef BuildFontServer
-# define BuildFontServer	YES
-#endif
-
-/*
  * Include fonts support
  */
 #ifndef BuildSpeedo
@@ -1876,16 +1869,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
 # define UseServerLock	YES
 #endif
 
-#ifndef XnestServer
-# define XnestServer		YES
-#endif
-#ifndef XVirtualFramebufferServer
-# define XVirtualFramebufferServer	YES
-#endif
-#ifndef XprtServer
-# define XprtServer			YES
-#endif
-
 #ifndef ServerExtraDefines
 # define ServerExtraDefines	XFree86ServerDefines
 #endif
diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf
index 71dab5631..3f922359e 100644
--- a/nx-X11/config/cf/xorg.cf
+++ b/nx-X11/config/cf/xorg.cf
@@ -1248,13 +1248,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
 #endif
 
 /*
- * Build the font server
- */
-#ifndef BuildFontServer
-# define BuildFontServer	YES
-#endif
-
-/*
  * Include fonts support
  */
 #ifndef BuildSpeedo
@@ -1441,13 +1434,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
diff --git a/nx-X11/config/cf/xorgsite.def b/nx-X11/config/cf/xorgsite.def
index dea5ceb92..eeaffa496 100644
--- a/nx-X11/config/cf/xorgsite.def
+++ b/nx-X11/config/cf/xorgsite.def
@@ -45,30 +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
- */
-
-/*
- * To enable building Xdmx, uncomment this.
- *
-#define XdmxServer YES
- */
-
-/*
- * To disable building Xprt, uncomment this.
- *
-#define XprtServer NO
- */
-
-/*
  * Set the default server (ie the one that gets the sym-link to "X")
  *
 #define ServerToInstall		Xorg
@@ -177,12 +153,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
  */
 
 /*
- * To disable building the font server, uncomment this.
- *
-#define BuildFontServer		NO
- */
-
-/*
  * Speedo fonts have been disabled by default in this release.
  * To re-enable support for Speedo fonts, uncomment this.
  *