As discussed and agreed on on the release-wranglers meeting of August 16,XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901

    I'm committing the patch from bug #1060 to back out unconditional
    Xprint functionality.
Back out Xprint changes.
Revert xman to CVS of June 5, revert xlogo to CVS of May 8, revert xedit to
    CVS of April 25, to back out unconditional Xprint support.
Fix up Xprint config logic to be like the rest of the extensions:
    BuildXprint is a one-stop option for disabling everything Xprint
    related. XprtServer controls building Xprt, BuildXprintLib controls
    building Xprint libs and BuildXprintClients controls building clients
    related to Xprint. BuiltXprint defaults to YES and the other options
    respects relevant settings, i.e. BuildServer and BuildServersOnly.
Build Xaw regardless of BuildXprintLib setting.
Only build xphelloworld, xplsprinters and xprehashprinterlist when
    BuildXprintClients it YES. Disable building xmore, it has always
    supported XawPrintShell.
Make Xprint support depend on BuildXprintLib.

1 files changed, 6 insertions, 0 deletions

diff --git a/xset.c b/xset.c
index f62ce78..c89eebe 100644
--- a/xset.c
+++ b/xset.c
@@ -88,7 +88,9 @@ in this Software without prior written authorization from The Open Group.
 static Status set_font_cache(Display *, long, long, long);
 static void query_cache_status(Display *dpy);
 #endif
+#ifdef XPRINT
 #include <X11/extensions/Print.h>
+#endif
 
 #define ON 1
 #define OFF 0
@@ -354,6 +356,7 @@ for (i = 1; i < argc; ) {
       }
   }
 #endif
+#ifdef XPRINT
   else if (strcmp(arg, "rehashprinterlist") == 0) { /* rehash list of printers */
       short dummy;
       if (XpQueryVersion(dpy, &dummy, &dummy)) {
@@ -362,6 +365,7 @@ for (i = 1; i < argc; ) {
           fprintf(stderr, "server does not have extension for rehashprinterlist option\n");
       }
   }
+#endif
   else if (strcmp(arg, "fp") == 0) {	       /* set font path */
     if (i >= argc) {
 	arg = "default";
@@ -1509,8 +1513,10 @@ usage(char *fmt, ...)
     fprintf (stderr, "    Show font cache statistics:\n");
     fprintf (stderr, "\t fc s\n");
 #endif
+#ifdef XPRINT
     fprintf (stderr, "    To control Xprint features:\n");
     fprintf (stderr, "\t rehashprinterlist      Recomputes the list of available printers\n");
+#endif
     fprintf (stderr, "    To set the font path:\n" );
     fprintf (stderr, "\t fp= path[,path...]\n" );
     fprintf (stderr, "    To restore the default font path:\n");