imake cleanup: Drop all references to XprtServer and BuildXprint*.

debian/rules

@@ -48,7 +48,6 @@ override_dh_install:
 	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/XK*.h
 	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/*Xv*.h
 	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xtrap*.h
-	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/Print*.h
 	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/XRes*.h
 	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/record*.h
 	rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86vmode.h

nx-X11/config/cf/README

@@ -325,14 +325,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

nx-X11/config/cf/X11.tmpl

@@ -373,8 +373,7 @@ XORGRELSTRING = XorgManVersionString
 #if (!defined(XF86Server) || !XF86Server) && (!defined (XorgServer) || !XorgServer)
 #define BuildFontLib		(BuildLibraries || BuildServer)
 #else
-#define BuildFontLib		(BuildLibraries || \
-				 (BuildServer && !DoLoadableServer) || XprtServer)
+#define BuildFontLib		(BuildLibraries || (BuildServer && !DoLoadableServer))
 #endif
 #endif
 #ifndef BuildFontCache
@@ -486,19 +485,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
@@ -978,17 +964,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
@@ -1221,7 +1196,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
@@ -1522,9 +1497,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
@@ -1657,7 +1629,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
 
@@ -2908,7 +2879,7 @@ UnsharedLibReferences(XA,NX_Xa,$(XALIBSRC))
 #endif
 
 #ifndef BuildXaw
-#define BuildXaw (BuildXprintLib && !BuildServersOnly)
+#define BuildXaw !BuildServersOnly
 #endif
 
        /* AWIDGETSRC is needed by libXaw6 and libXaw7 */

nx-X11/config/cf/host.def

@@ -76,21 +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 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.
  *
@@ -949,8 +934,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
 #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 BuildFontServer             NO
 #define BuildFreeType               NO
 #define BuildXTrueType              NO

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 Xprt, uncomment this.
- *
-#define XprtServer NO
- */
-
-/*
  * Set the default server (ie the one that gets the sym-link to "X")
  *
 #define ServerToInstall		XFree86

nx-X11/config/cf/xfree86.cf

@@ -1876,10 +1876,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
 # define UseServerLock	YES
 #endif
 
-#ifndef XprtServer
-# define XprtServer			YES
-#endif
-
 #ifndef ServerExtraDefines
 # define ServerExtraDefines	XFree86ServerDefines
 #endif

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 Xprt, uncomment this.
- *
-#define XprtServer NO
- */
-
-/*
  * Set the default server (ie the one that gets the sym-link to "X")
  *
 #define ServerToInstall		Xorg

nx-X11/include/extensions/Imakefile

@@ -92,7 +92,6 @@ HEADERS = Xext.h \
 	security.h securstr.h \
 	shape.h shapestr.h \
 	sync.h syncstr.h \
-	Print.h Printstr.h \
 	Xcup.h Xcupstr.h \
 	dpms.h dpmsstr.h \
 	XEVI.h XEVIstr.h

nx-X11/lib/Imakefile

@@ -181,10 +181,6 @@ REGEXDIR = regex
 XALIBDIR = Xa
 #endif
 
-#if BuildXprintLib
-XPRINTLIBDIRS = Xp XprintUtil XprintAppUtil
-#endif
-
 #if BuildFontCacheLib
 FONTCACHELIBDIR = Xfontcache
 #endif
@@ -221,7 +217,7 @@ LINTSUBDIRS = $(XAULIBDIR) $(XDMCPLIBDIR) $(X11LIBDIR) \
              $(OLDXLIBDIR) $(ICELIBDIR) $(SMLIBDIR) $(XEXTLIBDIR) $(XTLIBDIR) \
              $(SSLIBDIR) $(XF86MISCLIBDIR) $(XF86VMLIBDIR) $(XF86DGALIBDIR) \
              $(XF86RUSHLIBDIR) $(XMULIBDIR) $(XMUULIBDIR) $(XPMLIBDIR) \
-             $(XPRINTLIBDIRS) $(XAW6LIBDIR) $(XAW7LIBDIR) $(XAWLIBDIR) \
+             $(XAW6LIBDIR) $(XAW7LIBDIR) $(XAWLIBDIR) \
              $(XINPUTLIBDIR) $(XTSTLIBDIR) $(FSLIBDIR) $(XKBLIBDIR) \
              $(XKBUILIBDIR) $(LBXUTILDIR) $(XALIBDIR) $(EXPATBUILDDIR) \
              $(XVLIBDIR) $(GLXLIBDIR) $(GLULIBDIR) $(GLWLIBDIR) \

nx-X11/programs/Imakefile

@@ -57,9 +57,6 @@ SCREENSAVESRCDIR = beforelight
 #if BuildLBX
   LBXPROXYSRCDIR = lbxproxy
 #endif
-#if BuildXprintClients
-  XPSRCDIRS = xplsprinters xprehashprinterlist xphelloworld xpr
-#endif
   PROXYMGRSRCDIR = proxymngr
     RSTARTSRCDIR = rstart
    SMPROXYSRCDIR = smproxy
@@ -109,10 +106,6 @@ XTRAPCLIENTDIRS = xtrap
 #if BuildDPSClients
      DPSCLIENTDIRS = dpsinfo dpsexec texteroids
 #endif
-#if BuildDBElib && BuildXprintClients
-     DBECLIENTDIRS = xdbedizzy
-#endif
-
    XPMCLIENTDIRS = cxpm sxpm
 
 #if BuildGLXLibrary

nx-X11/programs/Xserver/Imakefile

@@ -158,49 +158,6 @@ INSTPGMFLAGS =
     LIBCWRAPPER = os/libcwrapper.o
 #endif
 
-#if BuildXprint
-
-XPCONFIGDIR = XpConfig
-
-#ifndef XpRasterDDX
-#define XpRasterDDX YES
-#endif
-#ifndef XpColorPclDDX
-#define XpColorPclDDX YES
-#endif
-#ifndef XpMonoPclDDX
-#define XpMonoPclDDX NO
-#endif
-#ifndef XpPostScriptDDX
-#define XpPostScriptDDX YES
-#endif
-
-#if XpRasterDDX
-XPRASTLIB = Xprint/raster/LibraryTargetName(raster)
-#endif
-#if XpColorPclDDX
-XPPCLLIB = Xprint/pcl/LibraryTargetName(pcl)
-#endif
-#if XpMonoPclDDX
-XPMPCLLIB = Xprint/pcl-mono/LibraryTargetName(pcl)
-#endif
-#if XpPostScriptDDX
-XPPSLIB = Xprint/ps/LibraryTargetName(ps)
-#endif
-
-XPDDXLIBS = Xprint/LibraryTargetName(printer) \
-	    $(XPRASTLIB) $(XPPCLLIB) $(XPMPCLLIB) $(XPPSLIB)
-XPDDXFBLIBS = $(MFB) $(CFB32)
-#if !PrintOnlyServer
-      XPFBLIBS = $(XPDDXFBLIBS)
-      XPDDX = $(XPDDXLIBS)
-#endif
-      XPDDXDIR = Xprint
-#endif
-#if !BuildXprint || PrintOnlyServer
-XPFBLIBS = dix/LibraryTargetName(xpstubs)
-#endif
-
 #if BuildRender
       RENDERDIR = render
       RENDERLIB = $(RENDERDIR)/librender.a
@@ -834,39 +791,6 @@ ServerDriverSDKTarget(Xorg)
 #endif
 #endif        /* XorgServer */
 
-#if defined(XprtServer) && XprtServer
-XCOMM
-XCOMM Print Server
-XCOMM
-MFBSUBDIR  = mfb
-CFB8SUBDIR = cfb
-CFB32SUBDIR = cfb32
-MIDAMAGEDIR = miext/damage
-XPSUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB32DIR) $(DEPDIRS) \
-	    $(MIDAMAGEDIR)
-XPOBJS = Xprint/ddxInit.o Xprint/dpmsstubs.o Xprint/miinitext.o
-#if PrintOnlyServer
-XPLIBS = PreFbLibs $(XPDDXLIBS) $(XPDDXFBLIBS) PostFbLibs
-#else
-XPLIBS = PreFbLibs PostFbLibs
-#endif
-#if (defined(SunArchitecture) || defined(SparcArchitecture)) && \
-    defined(SVR4Architecture)
-XPSYSLIBS = $(FONTLIBS) $(CBRT) $(SYSLIBS) $(XONLYLIB) -lw
-#else
-XPSYSLIBS = $(FONTLIBS) $(CBRT) $(SYSLIBS) $(XONLYLIB)
-#endif
-#if HasParallelMake
-MakeMutex($(XPSUBDIRS) $(XPOBJS) $(XPLIBS) $(XPSYSLIBS))
-#endif
-#if ForceServerRemake
-$(XPOBJS) $(XPLIBS) $(XPSYSLIBS):: $(XPSUBDIRS)
-	@if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi
-#endif
-ServerTarget(Xprt,$(XPSUBDIRS),$(XPOBJS), \
-	$(LIBCWRAPPER) $(XPLIBS) $(LOADABLEEXTS),$(XPSYSLIBS))
-#endif	/* XprtServer */
-
 #if defined(NXAgentServer) && NXAgentServer
 XCOMM
 XCOMM Nested server with NXlib-based ddx and compressed transport.

nx-X11/programs/Xserver/Xext/Imakefile

@@ -131,16 +131,11 @@ XF86BIGFOBJS = xf86bigfont.o
        XEVIEOBJS = xevie.o
 #endif
 
-#if BuildXprint
-      XPRINTSRCS = xprint.c
-      XPRINTOBJS = xprint.o
-#endif
-
        SRCS = shape.c $(SHMSRCS) $(MULTIBUFSRC) \
               mitmisc.c xtest.c xtest1di.c xtest1dd.c sleepuntil.c \
 	      bigreq.c sync.c $(SCRNSAVSRC) xcmisc.c $(VIDMODESRCS) \
 	      $(XF86MISCSRCS) $(XF86BIGFSRCS) $(XF86DGASRCS) $(SECURITYSRCS) \
-	      $(APPGROUPSRCS) $(XPRINTSRCS) $(CUPSRCS) $(PNRXSRCS) $(DPMSSRCS) \
+	      $(APPGROUPSRCS) $(CUPSRCS) $(PNRXSRCS) $(DPMSSRCS) \
 	      $(XEVIESRCS) \
 	      $(EVISRCS) $(XVSRCS) $(FONTCACHESRCS) $(XRESSRCS) $(DMXSRCS)
 
@@ -148,11 +143,11 @@ XF86BIGFOBJS = xf86bigfont.o
               mitmisc.o xtest.o xtest1di.o xtest1dd.o sleepuntil.o \
               bigreq.o sync.o $(SCRNSAVOBJ) xcmisc.o $(VIDMODEOBJS) \
 	      $(XF86MISCOBJS) $(XF86BIGFOBJS) $(XF86DGAOBJS) $(SECURITYOBJS) \
-	      $(APPGROUPOBJS) $(XPRINTOBJS) $(CUPOBJS) $(PNRXOBJS) $(DPMSOBJS) \
+	      $(APPGROUPOBJS) $(CUPOBJS) $(PNRXOBJS) $(DPMSOBJS) \
 	      $(XEVIEOBJS) \
 	      $(EVIOBJS) $(XVOBJS) $(FONTCACHEOBJS) $(XRESOBJS) $(DMXOBJS)
 
-      SOBJS = $(SHMOBJS) $(APPGROUPOBJS) $(SECURITYOBJS) $(XPRINTOBJS) \
+      SOBJS = $(SHMOBJS) $(APPGROUPOBJS) $(SECURITYOBJS) \
 	      shape.o xtest.o xtest1di.o xtest1dd.o sleepuntil.o $(PNRXOBJS) \
 	      $(XEVIEOBJS) \
 	      $(XF86BIGFOBJS)

nx-X11/programs/Xserver/dix/Imakefile

@@ -7,10 +7,8 @@ XCOMM $XFree86: xc/programs/Xserver/dix/Imakefile,v 3.17 2003/04/15 18:30:43 ala
 
 #include <Server.tmpl>
 
-#if !BuildXprint || PrintOnlyServer
 XPSRC = xpstubs.c
 XPOBJ = xpstubs.o
-#endif
 
 #if !HasFfs
 FFS_SRC = ffs.c
@@ -27,7 +25,7 @@ OBJS = atom.o colormap.o cursor.o devices.o dispatch.o dixutils.o events.o \
 	tables.o window.o initatoms.o dixfonts.o privates.o pixmap.o $(FFS_OBJ)
 
     INCLUDES = -I../include -I$(XINCLUDESRC) -I$(FONTINCSRC) -I$(EXTINCSRC) \
-	       -I$(SERVERSRC)/Xext -I$(SERVERSRC)/lbx -I../Xprint
+	       -I$(SERVERSRC)/Xext -I$(SERVERSRC)/lbx
     LINTLIBS = ../os/llib-los.ln
 
 /*
@@ -94,8 +92,6 @@ SpecialCObjectRule(pixmap,$(ICONFIGFILES),$(_NOOP_))
 SpecialCObjectRule(privates,$(ICONFIGFILES),$(_NOOP_))
 SpecialCObjectRule(window,$(ICONFIGFILES),$(QUARTZ_DEFINES))
 
-#if !BuildXprint || PrintOnlyServer
 NormalLibraryTarget(xpstubs,$(XPOBJ))
-#endif
 
 DependTarget()

nx-X11/programs/Xserver/dix/main.c

@@ -104,9 +104,6 @@ Equipment Corporation.
 #include "site.h"
 #include "dixfont.h"
 #include "extnsionst.h"
-#ifdef XPRINT
-#include "DiPrint.h"
-#endif
 #ifdef PANORAMIX
 #include "panoramiXsrv.h"
 #else
@@ -255,9 +252,6 @@ main(int argc, char *argv[], char *envp[])
     display = "0";
 
     InitGlobals();
-#ifdef XPRINT
-    PrinterInitGlobals();
-#endif
 
     /* Quartz support on Mac OS X requires that the Cocoa event loop be in
      * the main thread. This allows the X server main to be called again
@@ -370,9 +364,6 @@ main(int argc, char *argv[], char *envp[])
 	InitCallbackManager();
 	InitVisualWrap();
 	InitOutput(&screenInfo, argc, argv);
-#ifdef XPRINT
-	PrinterInitOutput(&screenInfo, argc, argv);
-#endif
 
 	if (screenInfo.numScreens < 1)
 	    FatalError("no screens found");

nx-X11/programs/Xserver/dix/xpstubs.c

@@ -33,9 +33,6 @@ from The Open Group.
 
 #include "misc.h"
 #include <X11/fonts/font.h>
-#ifdef XPRINT
-#include "DiPrint.h"
-#endif
 
 Bool
 XpClientIsBitmapClient(
@@ -51,27 +48,3 @@ XpClientIsPrintClient(
 {
     return FALSE;
 }
-#ifdef XPRINT
-int
-PrinterOptions(
-    int argc,
-    char **argv,
-    int i)
-{
-    return i;
-}
-void
-PrinterInitOutput(
-     ScreenInfo *pScreenInfo,
-     int argc,
-     char **argv)
-{
-}
-void PrinterUseMsg(void)
-{
-}
-void PrinterInitGlobals(void)
-{
-}
-#endif /* XPRINT */
-

nx-X11/programs/Xserver/hw/nxagent/Imakefile

@@ -66,6 +66,7 @@ SRCS =  NXwindow.c \
 	Composite.c \
 	Pixels.c \
 	stubs.c \
+	xpstubs.c \
 	miinitext.c \
 	$(SRCS1)
 
@@ -128,6 +129,7 @@ OBJS =  NXwindow.o \
 	Composite.o \
 	Pixels.o \
 	stubs.o \
+	xpstubs.o \
 	miinitext.o \
 	$(OBJS1)
 
@@ -220,6 +222,7 @@ DEFINES = -g $(OS_DEFINES) $(EXT_DEFINES) $(UPG_DEFINES) $(NX_DEFINES) \
 all:: $(OBJS)
 
 LinkSourceFile(stubs.c,$(SERVERSRC)/Xi)
+LinkSourceFile(xpstubs.c,$(SERVERSRC)/dix)
 SpecialCObjectRule(Init,$(ICONFIGFILES),$(_NOOP_))
 LinkSourceFile(miinitext.c,$(SERVERSRC)/mi)
 SpecialCObjectRule(miinitext,$(ICONFIGFILES), $(_NOOP_))

nx-X11/programs/Xserver/mi/miinitext.c

@@ -73,34 +73,6 @@ SOFTWARE.
 #undef GLXEXT
 #endif
 
-/* Make sure Xprt only announces extensions it supports */
-#ifdef PRINT_ONLY_SERVER
-#undef MITSHM /* this is incompatible to the vector-based Xprint DDX */
-#undef XKB
-#undef PANORAMIX
-#undef RES
-#undef XINPUT
-#undef XV
-#undef SCREENSAVER
-#undef XIDLE
-#undef XRECORD
-#undef XF86VIDMODE
-#undef XF86MISC
-#undef XFreeXDGA
-#undef XF86DRI
-#undef DPMSExtension
-#undef DPSEXT
-#undef FONTCACHE
-#undef DAMAGE
-#undef XFIXES
-#undef XEVIE
-#else
-#ifndef LOADABLEPRINTDDX
-#undef XPRINT
-#endif /* LOADABLEPRINTDDX */
-#endif /* PRINT_ONLY_SERVER */
-
-
 extern Bool noTestExtensions;
 
 #ifdef BIGREQS
@@ -232,9 +204,6 @@ typedef void (*InitExtension)(INITARGS);
 #define _XLBX_SERVER_
 #include <X11/extensions/lbxstr.h>
 #endif
-#ifdef XPRINT
-#include "Print.h"
-#endif
 #ifdef XAPPGROUP
 #define _XAG_SERVER_
 #include <X11/extensions/Xagstr.h>
@@ -321,9 +290,6 @@ extern void XagExtensionInit(INITARGS);
 #ifdef XCSECURITY
 extern void SecurityExtensionInit(INITARGS);
 #endif
-#ifdef XPRINT
-extern void XpExtensionInit(INITARGS);
-#endif
 #ifdef XF86BIGFONT
 extern void XFree86BigfontExtensionInit(INITARGS);
 #endif
@@ -606,9 +572,6 @@ InitExtensions(argc, argv)
 #ifdef XCSECURITY
     if (!noSecurityExtension) SecurityExtensionInit();
 #endif
-#ifdef XPRINT
-    XpExtensionInit(); /* server-specific extension, cannot be disabled */
-#endif
 #ifdef TOGCUP
     if (!noXcupExtension) XcupExtensionInit();
 #endif
@@ -642,11 +605,6 @@ InitExtensions(argc, argv)
     if (!noGlxExtension) DarwinGlxExtensionInit();
 #endif
 #endif
-#ifdef DPSEXT
-#ifndef XPRINT
-    if (!noDPSExtension) DPSExtensionInit();
-#endif
-#endif
 #ifdef XFIXES
     /* must be before Render to layer DisplayCursor correctly */
     if (!noXFixesExtension) XFixesExtensionInit();
@@ -717,9 +675,6 @@ static ExtensionModule staticExtensions[] = {
 #ifdef XCSECURITY
     { SecurityExtensionInit, SECURITY_EXTENSION_NAME, &noSecurityExtension, NULL, NULL },
 #endif
-#ifdef XPRINT
-    { XpExtensionInit, XP_PRINTNAME, NULL, NULL, NULL },
-#endif
 #ifdef PANORAMIX
     { PanoramiXExtensionInit, PANORAMIX_PROTOCOL_NAME, &noPanoramiXExtension, NULL, NULL },
 #endif

nx-X11/programs/Xserver/os/Imakefile

@@ -166,7 +166,7 @@ BOOTSTRAPCFLAGS =
 		  $(RANDOM_DEFINES) $(BUGMSG) $(XTRANS_FAILDEFINES) $(NX_DEFINES)
        INCLUDES = -I. -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) \
 		  -I$(SERVERSRC)/Xext -I$(FONTINCSRC) -I$(SERVERSRC)/render \
-		  -I$(TOP)/lib/Xau -I../lbx -I../Xprint Krb5Includes $(NX_INCLUDES)
+		  -I$(TOP)/lib/Xau -I../lbx Krb5Includes $(NX_INCLUDES)
  DEPEND_DEFINES = $(DBM_DEFINES) $(XDMCP_DEFINES) $(EXT_DEFINES) \
 		  $(TRANS_INCLUDES) $(CONNECTION_FLAGS) $(GETPEER_DEFINES) \
 		  DependDefines

nx-X11/programs/Xserver/os/utils.c

@@ -147,10 +147,6 @@ OR PERFORMANCE OF THIS SOFTWARE.
 #include "picture.h"
 #endif
 
-#ifdef XPRINT
-#include "DiPrint.h"
-#endif
-
 Bool noTestExtensions;
 #ifdef BIGREQS
 Bool noBigReqExtension = FALSE;
@@ -691,9 +687,6 @@ void UseMsg(void)
 #ifdef XCSECURITY
     ErrorF("-sp file               security policy file\n");
 #endif
-#ifdef XPRINT
-    PrinterUseMsg();
-#endif
     ErrorF("-su                    disable any save under support\n");
     ErrorF("-t #                   mouse threshold (pixels)\n");
     ErrorF("-terminate             terminate at server reset\n");
@@ -1102,12 +1095,6 @@ ProcessCommandLine(int argc, char *argv[])
 	    i = skip - 1;
 	}
 #endif
-#ifdef XPRINT
-	else if ((skip = PrinterOptions(argc, argv, i)) != i)
-	{
-	    i = skip - 1;
-	}
-#endif
 #ifdef XCSECURITY
 	else if ((skip = XSecurityOptions(argc, argv, i)) != i)
 	{

nx-libs.spec

@@ -1005,8 +1005,6 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama
 %{_includedir}/nx/X11/ap_keysym.h
 %{_includedir}/nx/X11/keysym.h
 %{_includedir}/nx/X11/keysymdef.h
-%{_includedir}/nx/X11/extensions/Print.h
-%{_includedir}/nx/X11/extensions/Printstr.h
 %{_includedir}/nx/X11/extensions/XI.h
 %{_includedir}/nx/X11/extensions/XIproto.h
 %{_includedir}/nx/X11/extensions/XResproto.h