From a667763d5b733f5ae2d8a3ca7e1e99d3deed2830 Mon Sep 17 00:00:00 2001
From: Kristian Høgsberg <krh@redhat.com>
Date: Mon, 16 Aug 2004 16:36:15 +0000
Subject: As discussed and agreed on on the release-wranglers meeting of August
 16,     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.

---
 xdpyinfo.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/xdpyinfo.c b/xdpyinfo.c
index e075b38..4d9c341 100644
--- a/xdpyinfo.c
+++ b/xdpyinfo.c
@@ -73,7 +73,9 @@ in this Software without prior written authorization from The Open Group.
 #ifdef DMX
 #include <X11/extensions/dmxext.h>
 #endif
+#ifdef XPRINT
 #include <X11/extensions/Print.h>
+#endif
 #include <X11/Xos.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -386,6 +388,7 @@ print_screen_info(Display *dpy, int scr)
     printf ("\n");
     printf ("screen #%d:\n", scr);
 
+#ifdef XPRINT
     /* Check whether this is a screen of a print DDX */
     if (hasExtension(dpy, XP_PRINTNAME)) {
         Screen **pscreens;
@@ -401,6 +404,7 @@ print_screen_info(Display *dpy, int scr)
         XFree(pscreens);		      
     }
     printf ("  print screen:    %s\n", isPrintScreen?"yes":"no");
+#endif
 
     if (isPrintScreen) {
         /* Print resolution is set on a per-printer basis (per-document
@@ -1196,6 +1200,7 @@ static int print_dmx_info(Display *dpy, char *extname)
 
 #endif /* DMX */
 
+#ifdef XPRINT
 static
 void print_xprint_attrpool(const char *name, const char *attrpool)
 {
@@ -1220,6 +1225,7 @@ void print_xprint_attrpool(const char *name, const char *attrpool)
 static int
 print_xprint_info(Display *dpy, char *extname)
 {  
+
   short           majorrev,
                   minorrev;
   int             xp_event_base,
@@ -1286,9 +1292,10 @@ print_xprint_info(Display *dpy, char *extname)
   }
   
   XpFreePrinterList(printerlist);
- 
+
   return 1;
 }
+#endif 
 
 /* utilities to manage the list of recognized extensions */
 
@@ -1340,7 +1347,9 @@ ExtensionPrintInfo known_extensions[] =
 #ifdef DMX
     {"DMX", print_dmx_info, False},
 #endif
+#ifdef XPRINT
     {XP_PRINTNAME, print_xprint_info, False},
+#endif
     /* add new extensions here */
 };
 
-- 
cgit v1.2.3