[xorg-commit-diffs] xc/config/cf WinLib.tmpl, 1.1.4.2.6.1, 1.1.4.2.6.1.6.1 X11.tmpl, 1.1.4.7.2.7.4.2, 1.1.4.7.2.7.4.3 bsdLib.tmpl, 1.1.4.2.6.1, 1.1.4.2.6.1.6.1 bsdiLib.tmpl, 1.1.4.1.6.1, 1.1.4.1.6.1.6.1 cygwin.tmpl, 1.1.4.3.2.1, 1.1.4.3.2.1.6.1 darwinLib.tmpl, 1.1.4.1.6.1, 1.1.4.1.6.1.6.1 gnuLib.tmpl, 1.1.4.1.6.1, 1.1.4.1.6.1.6.1 hpLib.tmpl, 1.1.4.1.6.1, 1.1.4.1.6.1.6.1 ibmLib.tmpl, 1.1.4.4.4.1, 1.1.4.4.4.1.6.1 lnxLib.tmpl, 1.1.4.4.4.1, 1.1.4.4.4.1.6.1 os2Lib.tmpl, 1.1.4.3.4.1, 1.1.4.3.4.1.6.1 osfLib.tmpl, 1.1.4.2.6.1, 1.1.4.2.6.1.6.1 sco5.cf, 1.1.4.3.2.1.6.2, 1.1.4.3.2.1.6.3 sv4Lib.tmpl, 1.1.4.2.6.1, 1.1.4.2.6.1.6.1 xprint_site.def, 1.1.2.2, 1.1.2.3

Roland Mainz xorg-commit at pdx.freedesktop.org
Tue Apr 13 16:32:23 PDT 2004 

Committed by: gisburn

Update of /cvs/xorg/xc/config/cf
In directory pdx:/tmp/cvs-serv11011/config/cf

Modified Files:
      Tag: XPRINT
	WinLib.tmpl X11.tmpl bsdLib.tmpl bsdiLib.tmpl cygwin.tmpl 
	darwinLib.tmpl gnuLib.tmpl hpLib.tmpl ibmLib.tmpl lnxLib.tmpl 
	os2Lib.tmpl osfLib.tmpl sco5.cf sv4Lib.tmpl xprint_site.def 
Log Message:
Fix for http://xprint.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=466 - RFE: Add XawPrintShell to the Athena toolkit library

Index: WinLib.tmpl
===================================================================
RCS file: /cvs/xorg/xc/config/cf/WinLib.tmpl,v
retrieving revision 1.1.4.2.6.1
retrieving revision 1.1.4.2.6.1.6.1
diff -u -d -r1.1.4.2.6.1 -r1.1.4.2.6.1.6.1
--- a/WinLib.tmpl	4 Mar 2004 17:45:37 -0000	1.1.4.2.6.1
+++ b/WinLib.tmpl	13 Apr 2004 23:32:20 -0000	1.1.4.2.6.1.6.1
@@ -6,7 +6,7 @@
 
 #define SharedOldXReqs $(LDPRELIBS) $(XONLYLIB)
 #define SharedXtReqs $(LDPRELIBS) $(XONLYLIB)
-#define SharedXawReqs $(LDPRELIBS) $(XMULIB) $(XTOOLLIB) $(XLIB)
+#define SharedXawReqs $(LDPRELIBS) $(XMULIB) $(XTOOLLIB) $(XPLIB) $(XLIB)
 #define SharedXmuReqs $(LDPRELIBS) $(XTOOLLIB) $(XLIB)
 #define SharedXextReqs $(LDPRELIBS) $(XONLYLIB)
 #define SharedXiReqs $(LDPRELIBS) $(XLIB)

Index: X11.tmpl
===================================================================
RCS file: /cvs/xorg/xc/config/cf/X11.tmpl,v
retrieving revision 1.1.4.7.2.7.4.2
retrieving revision 1.1.4.7.2.7.4.3
diff -u -d -r1.1.4.7.2.7.4.2 -r1.1.4.7.2.7.4.3
--- a/X11.tmpl	12 Apr 2004 12:20:41 -0000	1.1.4.7.2.7.4.2
+++ b/X11.tmpl	13 Apr 2004 23:32:20 -0000	1.1.4.7.2.7.4.3
@@ -3610,10 +3610,10 @@
 #endif
 
 #ifndef XawClientDepLibs
-#define XawClientDepLibs $(DEPXAWLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXPMLIB) $(DEPXLIB)
+#define XawClientDepLibs $(DEPXAWLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXPMLIB) $(DEPXPLIB) $(DEPXLIB)
 #endif
 #ifndef XawClientLibs
-#define XawClientLibs $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB)
+#define XawClientLibs $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XPLIB) $(XLIB)
 #endif
 
 #ifndef SharedLibXTrap

Index: bsdLib.tmpl
===================================================================
RCS file: /cvs/xorg/xc/config/cf/bsdLib.tmpl,v
retrieving revision 1.1.4.2.6.1
retrieving revision 1.1.4.2.6.1.6.1
diff -u -d -r1.1.4.2.6.1 -r1.1.4.2.6.1.6.1
--- a/bsdLib.tmpl	4 Mar 2004 17:45:37 -0000	1.1.4.2.6.1
+++ b/bsdLib.tmpl	13 Apr 2004 23:32:20 -0000	1.1.4.2.6.1.6.1
@@ -43,7 +43,7 @@
 #endif
 
 #ifndef XawClientLibs
-#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(XLIB)
+#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(XPLIB) $(XLIB)
 #endif
 
 /* Allow for libpthread, as overridden by OS definitions */
@@ -56,8 +56,8 @@
 #ifndef SharedXtReqs
 #define SharedXtReqs	$(LDPRELIBS) $(XONLYLIB) $(SMLIB) $(ICELIB)
 #endif
-#define SharedXawReqs	$(LDPRELIBS) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB)
-#define SharedXaw6Reqs	$(LDPRELIBS) $(XMULIB) $(XTOOLLIB) $(XLIB)
+#define SharedXawReqs	$(LDPRELIBS) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XPLIB) $(XLIB)
+#define SharedXaw6Reqs	$(LDPRELIBS) $(XMULIB) $(XTOOLLIB) $(XPLIB) $(XLIB)
 #define SharedXmuReqs	$(LDPRELIBS) $(XTOOLLIB) $(XLIB)
 #define SharedXmuuReqs	$(LDPRELIB)  $(XONLYLIB)
 #define SharedXextReqs	$(LDPRELIBS) $(XONLYLIB)

Index: bsdiLib.tmpl
===================================================================
RCS file: /cvs/xorg/xc/config/cf/bsdiLib.tmpl,v
retrieving revision 1.1.4.1.6.1
retrieving revision 1.1.4.1.6.1.6.1
diff -u -d -r1.1.4.1.6.1 -r1.1.4.1.6.1.6.1
--- a/bsdiLib.tmpl	4 Mar 2004 17:45:37 -0000	1.1.4.1.6.1
+++ b/bsdiLib.tmpl	13 Apr 2004 23:32:20 -0000	1.1.4.1.6.1.6.1
@@ -16,7 +16,7 @@
 #endif
 
 #ifndef XawClientLibs
-#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(XLIB)
+#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(XPLIB) $(XLIB)
 #endif
 
 #define FrescoSysLibs	CplusplusLibC MathLibrary
@@ -25,8 +25,8 @@
 #define SharedXlibi18nReqs $(LDPRELIB) $(XONLYLIB)
 #define SharedOldXReqs	$(LDPRELIB) $(XONLYLIB)
 #define SharedXtReqs	$(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB)
-#define SharedXawReqs	$(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB)
-#define SharedXaw6Reqs	$(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
+#define SharedXawReqs	$(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XPLIB) $(XLIB)
+#define SharedXaw6Reqs	$(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPLIB) $(XLIB)
 #define SharedXmuReqs	$(LDPRELIB) $(XTOOLLIB) $(XLIB)
 #define SharedXextReqs	$(LDPRELIB) $(XONLYLIB)
 #define SharedXiReqs	$(LDPRELIB) $(XLIB)

Index: cygwin.tmpl
===================================================================
RCS file: /cvs/xorg/xc/config/cf/cygwin.tmpl,v
retrieving revision 1.1.4.3.2.1
retrieving revision 1.1.4.3.2.1.6.1
diff -u -d -r1.1.4.3.2.1 -r1.1.4.3.2.1.6.1
--- a/cygwin.tmpl	4 Mar 2004 17:45:37 -0000	1.1.4.3.2.1
+++ b/cygwin.tmpl	13 Apr 2004 23:32:20 -0000	1.1.4.3.2.1.6.1
@@ -9,8 +9,8 @@
 #define SharedOldXReqs		$(LDPRELIB) $(XONLYLIB)
 #define SharedXReqs		$(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS)
 #define SharedXtReqs		$(LDPRELIB) $(SMLIB) $(ICELIB) $(XONLYLIB)
-#define SharedXawReqs		$(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB)
-#define SharedXaw6Reqs		$(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB)
+#define SharedXawReqs		$(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XPLIB) $(XLIB)
+#define SharedXaw6Reqs		$(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XPLIB) $(XLIB)
 #define SharedXmuReqs 		$(LDPRELIB) $(XTOOLLIB) $(XLIB)
 #define SharedXextReqs		$(LDPRELIB) $(XONLYLIB)
 #define SharedXiReqs		$(LDPRELIB) $(XLIB)
@@ -57,7 +57,7 @@
 #endif
 
 #ifndef XawClientLibs
-# define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(XLIB)
+# define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(XPLIB) $(XLIB)
 #endif
 
 

Index: darwinLib.tmpl
===================================================================
RCS file: /cvs/xorg/xc/config/cf/darwinLib.tmpl,v
retrieving revision 1.1.4.1.6.1
retrieving revision 1.1.4.1.6.1.6.1
diff -u -d -r1.1.4.1.6.1 -r1.1.4.1.6.1.6.1
--- a/darwinLib.tmpl	4 Mar 2004 17:45:37 -0000	1.1.4.1.6.1
+++ b/darwinLib.tmpl	13 Apr 2004 23:32:20 -0000	1.1.4.1.6.1.6.1
@@ -10,7 +10,7 @@
 #endif
 
 #ifndef XawClientLibs
-#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(XLIB)
+#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(XPLIB) $(XLIB)
 #endif
 
 /* Allow for libpthread, as overridden by OS definitions */
@@ -27,8 +27,8 @@
 #define SharedGLUReqs       $(LDPRELIB) $(XLIB) $(GLXLIB)
 #define SharedOSMesaReqs    $(LDPRELIB) $(XLIB) $(GLXLIB)
 #define SharedSMReqs        $(LDPRELIB) $(ICELIB)
-#define SharedXawReqs       $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB)
-#define SharedXaw6Reqs      $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
+#define SharedXawReqs       $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XPLIB) $(XLIB)
+#define SharedXaw6Reqs      $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPLIB) $(XLIB)
 #define SharedXcursorReqs   $(LDPRELIB) $(XRENDERLIB) $(XLIB)
 #define SharedXextReqs      $(LDPRELIB) $(XONLYLIB)
 #define SharedXiReqs        $(LDPRELIB) $(XLIB)

Index: gnuLib.tmpl
===================================================================
RCS file: /cvs/xorg/xc/config/cf/gnuLib.tmpl,v
retrieving revision 1.1.4.1.6.1
retrieving revision 1.1.4.1.6.1.6.1
diff -u -d -r1.1.4.1.6.1 -r1.1.4.1.6.1.6.1
--- a/gnuLib.tmpl	4 Mar 2004 17:45:37 -0000	1.1.4.1.6.1
+++ b/gnuLib.tmpl	13 Apr 2004 23:32:20 -0000	1.1.4.1.6.1.6.1
@@ -11,15 +11,15 @@
 #endif
 
 #ifndef XawClientLibs
-#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(XLIB)
+#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(XPLIB) $(XLIB)
 #endif
 
 #define SharedX11Reqs
 #define SharedXlibi18nReqs $(LDPRELIB) $(XONLYLIB)
 #define SharedOldXReqs	$(LDPRELIB) $(XONLYLIB)
 #define SharedXtReqs	$(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB)
-#define SharedXaw6Reqs	$(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
-#define SharedXawReqs	$(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB)
+#define SharedXaw6Reqs	$(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPLIB) $(XLIB)
+#define SharedXawReqs	$(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XPLIB) $(XLIB)
 #define SharedXmuReqs	$(LDPRELIB) $(XTOOLLIB) $(XLIB)
 #define SharedXextReqs	$(LDPRELIB) $(XONLYLIB)
 #define SharedXiReqs	$(LDPRELIB) $(XLIB)

Index: hpLib.tmpl
===================================================================
RCS file: /cvs/xorg/xc/config/cf/hpLib.tmpl,v
retrieving revision 1.1.4.1.6.1
retrieving revision 1.1.4.1.6.1.6.1
diff -u -d -r1.1.4.1.6.1 -r1.1.4.1.6.1.6.1
--- a/hpLib.tmpl	4 Mar 2004 17:45:37 -0000	1.1.4.1.6.1
+++ b/hpLib.tmpl	13 Apr 2004 23:32:20 -0000	1.1.4.1.6.1.6.1
@@ -12,7 +12,7 @@
 #define SharedOldXReqs		$(XONLYLIB)
 #define SharedX11Reqs		SharedThreadReqs
 #define SharedXtReqs		$(XONLYLIB) $(SMLIB) $(ICELIB) SharedThreadReqs
-#define SharedXawReqs		$(XMULIB) $(XTOOLLIB) $(XLIB)
+#define SharedXawReqs		$(XMULIB) $(XTOOLLIB) $(XPLIB) $(XLIB)
 #define SharedXmuReqs		$(XTOOLLIB) $(XLIB)
 #define SharedXextReqs		$(XONLYLIB)
 #define SharedXiReqs		$(XLIB)

Index: ibmLib.tmpl
===================================================================
RCS file: /cvs/xorg/xc/config/cf/ibmLib.tmpl,v
retrieving revision 1.1.4.4.4.1
retrieving revision 1.1.4.4.4.1.6.1
diff -u -d -r1.1.4.4.4.1 -r1.1.4.4.4.1.6.1
--- a/ibmLib.tmpl	4 Mar 2004 17:45:37 -0000	1.1.4.4.4.1
+++ b/ibmLib.tmpl	13 Apr 2004 23:32:20 -0000	1.1.4.4.4.1.6.1
@@ -35,8 +35,8 @@
 #define SharedXmuuReqs	$(XLIBONLY)
 #define SharedOldXReqs	$(XLIBONLY)
 #define SharedXtReqs	$(XLIBONLY) $(SMLIB) $(ICELIB) SharedThreadReqs
-#define SharedXawReqs	$(XMULIB) $(XTOOLLIB) $(XLIB) $(XPMLIB)
-#define SharedXaw6Reqs	$(XMULIB) $(XTOOLLIB) $(XLIB)
+#define SharedXawReqs	$(XMULIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(XPMLIB)
+#define SharedXaw6Reqs	$(XMULIB) $(XTOOLLIB) $(XPLIB) $(XLIB)
 #define SharedXiReqs	$(XLIB)
 #define SharedXtstReqs	$(XLIB)
 #define SharedPexReqs	$(XONLYLIB)

Index: lnxLib.tmpl
===================================================================
RCS file: /cvs/xorg/xc/config/cf/lnxLib.tmpl,v
retrieving revision 1.1.4.4.4.1
retrieving revision 1.1.4.4.4.1.6.1
diff -u -d -r1.1.4.4.4.1 -r1.1.4.4.4.1.6.1
--- a/lnxLib.tmpl	4 Mar 2004 17:45:37 -0000	1.1.4.4.4.1
+++ b/lnxLib.tmpl	13 Apr 2004 23:32:20 -0000	1.1.4.4.4.1.6.1
@@ -14,15 +14,15 @@
 #endif
 
 #ifndef XawClientLibs
-#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(XLIB)
+#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(XPLIB) $(XLIB)
 #endif
 
 #define SharedX11Reqs
 #define SharedXlibi18nReqs $(LDPRELIB) $(XONLYLIB)
 #define SharedOldXReqs	  $(LDPRELIB) $(XONLYLIB)
 #define SharedXtReqs	  $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB)
-#define SharedXaw6Reqs	  $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
-#define SharedXawReqs	  $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB)
+#define SharedXaw6Reqs	  $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPLIB) $(XLIB)
+#define SharedXawReqs	  $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XPLIB) $(XLIB)
 #define SharedXmuReqs	  $(LDPRELIB) $(XTOOLLIB) $(XLIB)
 #define SharedXmuuReqs	  $(LDPRELIB) $(XONLYLIB)
 #define SharedXextReqs	  $(LDPRELIB) $(XONLYLIB)

Index: os2Lib.tmpl
===================================================================
RCS file: /cvs/xorg/xc/config/cf/os2Lib.tmpl,v
retrieving revision 1.1.4.3.4.1
retrieving revision 1.1.4.3.4.1.6.1
diff -u -d -r1.1.4.3.4.1 -r1.1.4.3.4.1.6.1
--- a/os2Lib.tmpl	4 Mar 2004 17:45:37 -0000	1.1.4.3.4.1
+++ b/os2Lib.tmpl	13 Apr 2004 23:32:20 -0000	1.1.4.3.4.1.6.1
@@ -17,8 +17,8 @@
 #define SharedX11Reqs $(LDPRELIB) -lshm
 #define SharedOldXReqs $(LDPRELIB) $(XONLYLIB)
 #define SharedXtReqs $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB)
-#define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
-#define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB)
+#define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPLIB) $(XLIB)
+#define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XPLIB) $(XLIB)
 #define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB)
 #define SharedXmuuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB)
 #define SharedXextReqs $(LDPRELIB) $(XONLYLIB)
@@ -151,7 +151,7 @@
        DEPXMULIB = 
           XMULIB = _Use(SDlibXmu,-L$(XMUSRC) SDlibXmu) $(XLIB)
 #ifndef XawClientLibs
-#define XawClientLibs $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB)
+#define XawClientLibs $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XPLIB) $(XLIB)
 #endif
 #endif
 #if SharedOldX

Index: osfLib.tmpl
===================================================================
RCS file: /cvs/xorg/xc/config/cf/osfLib.tmpl,v
retrieving revision 1.1.4.2.6.1
retrieving revision 1.1.4.2.6.1.6.1
diff -u -d -r1.1.4.2.6.1 -r1.1.4.2.6.1.6.1
--- a/osfLib.tmpl	4 Mar 2004 17:45:37 -0000	1.1.4.2.6.1
+++ b/osfLib.tmpl	13 Apr 2004 23:32:20 -0000	1.1.4.2.6.1.6.1
@@ -20,7 +20,7 @@
 #endif
 #define SharedXtReqs $(LDPRELIBS) $(XONLYLIB) $(SMLIB) $(ICELIB) SharedThreadReqs
 #if ModernOSF1
-#define SharedXawReqs $(LDPRELIBS) $(XMULIB) $(XTOOLLIB) $(XLIB)
+#define SharedXawReqs $(LDPRELIBS) $(XMULIB) $(XTOOLLIB) $(XPLIB) $(XLIB)
 #else
 #define SharedXawReqs $(LDPRELIBS) $(XMULIB) $(XTOOLLIB) $(XLIB) -init _XawFixupVendorShell
 #endif

Index: sco5.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/sco5.cf,v
retrieving revision 1.1.4.3.2.1.6.2
retrieving revision 1.1.4.3.2.1.6.3
diff -u -d -r1.1.4.3.2.1.6.2 -r1.1.4.3.2.1.6.3
--- a/sco5.cf	12 Apr 2004 12:20:41 -0000	1.1.4.3.2.1.6.2
+++ b/sco5.cf	13 Apr 2004 23:32:20 -0000	1.1.4.3.2.1.6.3
@@ -212,7 +212,7 @@
 #endif
 
 #ifndef XawClientLibs
-#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(XLIB)
+#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(XPLIB) $(XLIB)
 #endif
 
 #define SharedXlibi18nReqs $(LDPRELIB) $(XLIBONLY)
@@ -225,8 +225,8 @@
 #define SharedPexReqs       $(LDPRELIB) $(XONLYLIB) MathLibrary
 #define SharedSMReqs        $(LDPRELIB) $(ICELIB)
 #define SharedX11Reqs       $(LDPRELIB) -lsocket
-#define SharedXawReqs       $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB)
-#define SharedXaw6Reqs      $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
+#define SharedXawReqs       $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XPLIB) $(XLIB)
+#define SharedXaw6Reqs      $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPLIB) $(XLIB)
 #define SharedXcursorReqs   $(LDPRELIB) $(XRENDERLIB) $(XLIB)
 #define SharedXextReqs      $(LDPRELIB) $(XONLYLIB)
 #define SharedXiReqs        $(LDPRELIB) $(XLIB)

Index: sv4Lib.tmpl
===================================================================
RCS file: /cvs/xorg/xc/config/cf/sv4Lib.tmpl,v
retrieving revision 1.1.4.2.6.1
retrieving revision 1.1.4.2.6.1.6.1
diff -u -d -r1.1.4.2.6.1 -r1.1.4.2.6.1.6.1
--- a/sv4Lib.tmpl	4 Mar 2004 17:45:37 -0000	1.1.4.2.6.1
+++ b/sv4Lib.tmpl	13 Apr 2004 23:32:20 -0000	1.1.4.2.6.1.6.1
@@ -13,7 +13,7 @@
 XMULIB = $(XMULIBONLY) -z nodefs
 #endif
 #ifndef XawClientLibs
-# define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(XLIB)
+# define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(XPLIB) $(XLIB)
 #endif
 
 #if 0

Index: xprint_site.def
===================================================================
RCS file: /cvs/xorg/xc/config/cf/Attic/xprint_site.def,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- a/xprint_site.def	13 Apr 2004 05:07:46 -0000	1.1.2.2
+++ b/xprint_site.def	13 Apr 2004 23:32:20 -0000	1.1.2.3
@@ -120,6 +120,9 @@
 #define BuildFontCache                 NO
 #define BuildRender                    NO
 #define BuildRenderLibrary             NO
+#define BuildRandRLibrary              NO
+#define BuildXcursorLibrary            NO
+#define BuildXcursorgen                NO
 /* CAUTION: The XF86 "smart" scheduler breaks Xprt */
 #define UseSmartScheduler              NO
 
@@ -134,7 +137,7 @@
 #define XVendorRelease 100000
 
 #define UseHackLinkAgainstInstalledX11Libs YES
-#ifdef UseHackLinkAgainstInstalledX11Libs
+#if UseHackLinkAgainstInstalledX11Libs
 /* "Hack" to reuse an already installed X11 distribution when linking our
  * programs (this assumes that the installed X version is at least X11R6.4) */
 # ifndef IBMArchitecture

More information about the xorg-commit-diffs mailing list