summaryrefslogtreecommitdiff
path: root/ibmLib.tmpl
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@redhat.com>2004-08-16 16:36:14 +0000
committerKristian Høgsberg <krh@redhat.com>2004-08-16 16:36:14 +0000
commit4444b3a7053408fa144ba82ce0cda9ec015a30ce (patch)
treeb06744588575a8c923996e190bebef1511f74240 /ibmLib.tmpl
parentee7e6fb1f1163fc284a6591910f15082d36c40b1 (diff)
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.
Diffstat (limited to 'ibmLib.tmpl')
-rw-r--r--ibmLib.tmpl6
1 files changed, 3 insertions, 3 deletions
diff --git a/ibmLib.tmpl b/ibmLib.tmpl
index dc0c0a6..603fdd4 100644
--- a/ibmLib.tmpl
+++ b/ibmLib.tmpl
@@ -1,5 +1,5 @@
XCOMM $Xorg: ibmLib.tmpl,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-XCOMM $XdotOrg: xc/config/cf/ibmLib.tmpl,v 1.1.4.4.4.1.6.1 2004/04/13 23:32:20 gisburn Exp $
+XCOMM $XdotOrg: xc/config/cf/ibmLib.tmpl,v 1.2 2004/04/23 18:41:58 eich Exp $
/*
* AIX shared library template
@@ -35,8 +35,8 @@ XCOMM $XFree86: xc/config/cf/ibmLib.tmpl,v 1.3tsi Exp $
#define SharedXmuuReqs $(XLIBONLY)
#define SharedOldXReqs $(XLIBONLY)
#define SharedXtReqs $(XLIBONLY) $(SMLIB) $(ICELIB) SharedThreadReqs
-#define SharedXawReqs $(XMULIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(XPMLIB)
-#define SharedXaw6Reqs $(XMULIB) $(XTOOLLIB) $(XPLIB) $(XLIB)
+#define SharedXawReqs $(XMULIB) $(XTOOLLIB) $(XLIB) $(XPMLIB)
+#define SharedXaw6Reqs $(XMULIB) $(XTOOLLIB) $(XLIB)
#define SharedXiReqs $(XLIB)
#define SharedXtstReqs $(XLIB)
#define SharedPexReqs $(XONLYLIB)