Wed Apr 21 20:03:18 EST 2004

Committed by: gisburn

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

Modified Files:
      Tag: XORG-CURRENT
	FreeBSD.cf Imake.tmpl NetBSD.cf OpenBSDLib.tmpl README 
	WinLib.tmpl X11.tmpl bsdLib.tmpl bsdiLib.tmpl cygwin.tmpl 
	darwinLib.tmpl gnuLib.tmpl hpLib.tmpl ibmLib.tmpl linux.cf 
	lnxLib.tmpl os2Lib.tmpl osfLib.tmpl sco5.cf sun.cf sunLib.tmpl 
	sv4Lib.tmpl 
Added Files:
      Tag: XORG-CURRENT
	xprint_site.def 
Log Message:
Fix for http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=530 - Land XPRINT branch on XORG-CURRENT

--- NEW FILE: xprint_site.def ---

/*
 * Enable this if you want to build the GISWxprintglue package...
 * #define BuildGISWxprintglue YES
 * Then do a % make World ; cd packager/solaris/GISWxprintglue/ ; make make_GISWxprintglue
 */
 
/*
 * Enable this if you want to build the GISWxprint package...
 * #define BuildGISWxprint YES
 * Then do a % make World ; cd packager/solaris/GISWxprint/ ; make make_GISWxprint
 */

/*
 * Enable this if you want to build the Debian Xprint server package
 * #define BuildDebianXprintPackage YES
 */

/*
 * If you build a RPM package from this tree the xprint.spec file
 * will set BuildXprintRPMPackage to YES
 */
 
/*
 * Enable this if you want to build the Mozilla Xprint XPI server package
 * #define BuildMozillaXprintXPIPackage YES
 */
 
/* HasDocBookTools - set to YES if "xsltproc", "xmllint", "docbook2man",
 * "lynx" and the docbook-xsl-stylesheets are installed.
 * #define HasDocBookTools YES
 */

/* #########################################################################
 * ############ xprint.mozdev.org defaults start (do not edit!) ############
 * #########################################################################
 */

#ifndef BuildGISWxprintglue
# define BuildGISWxprintglue           NO
#endif /* BuildGISWxprintglue */

#ifndef BuildGISWxprint
# define BuildGISWxprint               NO
#endif /* BuildGISWxprint */

#ifndef BuildDebianXprintPackage
# define BuildDebianXprintPackage      NO
#endif /* BuildDebianXprintPackage */

#ifndef BuildXprintRPMPackage
# define BuildXprintRPMPackage         NO
#endif /* BuildXprintRPMPackage */

#ifndef BuildMozillaXprintXPIPackage
# define BuildMozillaXprintXPIPackage  NO
#endif /* BuildMozillaXprintXPIPackage */

/* If we do not build any of the special packages then build and
 * install everything */
#ifndef BuildFullXprintDistrib
# if BuildGISWxprintglue || BuildGISWxprint || BuildDebianXprintPackage || BuildXprintRPMPackage || BuildMozillaXprintXPIPackage
#  define BuildFullXprintDistrib       NO
# else
#  define BuildFullXprintDistrib       YES
# endif /* BuildGISWxprintglue || BuildGISWxprint || BuildDebianXprintPackage || BuildXprintRPMPackage || BuildMozillaXprintXPIPackage */
#endif /* BuildFullXprintDistrib */

/* Verify that only one package is enabled at the same time */
#if (BuildGISWxprintglue + BuildGISWxprint + BuildDebianXprintPackage + BuildXprintRPMPackage + BuildFullXprintDistrib + BuildMozillaXprintXPIPackage) > 1
# error Building more than one special package is not allowed.
#endif /* Verify */

/* Some flags to build the Xprint server (Xprt), the tools and the fonts */
#define BuildServer	               YES
#define XprtServer	               YES

/* Needed to build encoding files */
#define BuildFonts	               YES
#define BuildSpeedoFonts               NO
#define BuildType1Fonts                NO
#define BuildCIDFonts                  NO
#define BuildTrueTypeFonts             NO
#define BuildEthiopicFonts             NO
#define BuildBethMarduthoFonts         NO

#define GzipFontCompression            YES
#define BuildFreeType	               YES
/* Xprt does not have special support for GLX and XIE (yet) */
#define BuildGlxExt                    NO
#define BuildXIE                       NO
/* X extensions not needed */
#define BuildDBE	               NO
#define BuildXKB	               NO
#define BuildRECORD	               NO
#define BuildDPMS	               NO
#define BuildXF86VidModeExt            NO
#define BuildXInputExt                 NO
#define BuildScreenSaverExt            NO
#define BuildXvExt                     NO
/* LBX is needed for compatibility to the XWeb stuff */
#define BuildLBX	YES
/* Xprt's non-bitmap based DDX (PS, PCL, PDF, SVGprint etc.) cannot support MIT-SHM */
#undef HasShm
#define HasShm NO
/* Disable stipple code due portability issues
 * (see http://xprint.mozdev.org/bugs/show_bug.cgi?id=2220) */
#define BuildStippleCode NO

/* Temporary for Xorg tree */
#define BuildFontconfigLibrary         NO
#define XorgServer                     NO
#define XF86Server                     NO
#define XnestServer                    NO
#define XVirtualFramebufferServer      NO

#define BuildFreetype2Library          YES
#define SharedLibFreetype2             NO
#define NormalLibFreetype2             YES

#define HasFreetype2                   NO
#define BuildXTrueType                 NO
#define BuildType1                     NO
#define BuildCID                       NO
#define BuildSpeedo                    NO
#define BuildFontCache                 NO
#define BuildRender                    NO
#define BuildRenderLibrary             NO
#define BuildRandRLibrary              NO
#define BuildXcursorLibrary            NO
#define BuildXcursorgen                NO
#define SharedLibFontEnc               NO

/* Build only Xprint applications */
#ifndef BuildXprintAppsOnly
#define BuildXprintAppsOnly YES
#endif /* BuildXprintAppsOnly */

/* Set our own XVendorString/XVendorRelease
 * (and to avoid that xfree86.cf sets it's own stuff here) */
#define XVendorString "xprint.mozdev.org"
#define XVendorRelease 100000

#define UseHackLinkAgainstInstalledX11Libs NO
#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
#  define LdPreLib -L$(USRLIBDIR) -R$(USRLIBDIR) -L$(BUILDLIBDIR)
# endif /* !IBMArchitecture */
#endif /* UseHackLinkAgainstInstalledX11Libs */

XCOMM #### Sun/Solaris-specifc stuff ... ####
#if defined(SunArchitecture) && (OSMajorVersion > 4)
#undef XsunServer
#define XsunServer    NO

XCOMM X11R6.7's sun.cf does not set ProjectRoot to /usr/openwin anymore - why ?
#define ProjectRoot      /usr/openwin
#define ServerConfigDir  /usr/openwin/server/etc

XCOMM Some build hacks for the GISWxprintglue package
#if BuildGISWxprintglue
#  define ProjectRoot      /usr/openwin
#  define ServerConfigDir  /usr/openwin/server/etc
#  define BinDir           /opt/GISWxprintglue/bin
#  define ManDirectoryRoot /opt/GISWxprintglue/man
#  undef XPrintDir
#  define XPrintDir        /opt/GISWxprintglue/server/etc/XpConfig
   /* PCL DDXs are currently defunct in Solaris Xprt, so do not ship the
    * config files for now */
#  undef XpColorPclDDX
#  define XpColorPclDDX NO
#  undef XpMonoPclDDX
#  define XpMonoPclDDX NO
   /* GISWxprintglue uses the Solaris Xprt server which uses the Solaris
    * encoding/ttmap files for font encodings
    */
#  define InstallXF86EncodingFiles NO
#endif /* BuildGISWxprintglue */

XCOMM Some build hacks for the GISWxprint package
#if BuildGISWxprint
#  define ProjectRoot      /usr/openwin
#  define ServerConfigDir  /usr/openwin/server/etc
#  define BinDir           /opt/GISWxprint/bin
#  define ManDirectoryRoot /opt/GISWxprint/man
#  undef XPrintDir
#  define XPrintDir        /opt/GISWxprint/server/etc/XpConfig
   /* PCL DDXs are currently defunct in Solaris Xprt, so do not ship the
    * config files for now */
#  undef XpColorPclDDX
#  define XpColorPclDDX NO
#  undef XpMonoPclDDX
#  define XpMonoPclDDX NO
   /* Make sure we install our own encoding files since Solaris uses a format we
    * (currently) do not support (yet).
    */
#  define InstallXF86EncodingFiles YES
#  undef XF86EncodingsPath
#  define XF86EncodingsPath /opt/GISWxprint/lib/X11/fonts/encodings
#endif /* GISWxprint */

/* Install XF86 encoding files since that's the only format we currently support */
#ifndef InstallXF86EncodingFiles
#define InstallXF86EncodingFiles YES
#endif /* InstallXF86EncodingFiles */

#define HasVarDirectory NO
#undef HasMotif2
#define HasMotif2 YES

#if 1 /* Switch for 32bit binaries or 64bit binaries */
   /* 32bit SPARC */
#  define CcCmd                       /opt/SUNWspro/bin/cc
#  define CplusplusCmd                /opt/SUNWspro/bin/CC
#else
   /* 64bit sparc (Doesn't really work yet because the Xservers cannot link properly... ;-( */
#  define ServerExtraDefines   -D_XSERVER64
#  define CcCmd                       /opt/SUNWspro/bin/cc -xarch=v9a
#  define CplusplusCmd                /opt/SUNWspro/bin/CC -xarch=v9a
#  define UsrLibDir /usr/openwin/lib/sparcv9
#endif

#if 0 /* Development only */
   XCOMM Explicitly use "-xs" to make Rational Purify "happy"
#  undef OptimizedCDebugFlags
#  define OptimizedCDebugFlags -xs -g -DDEBUG_$(LOGNAME)
#endif

XCOMM #### FreeBSD-specifc stuff ... ####
#elif defined(FreeBSDArchitecture)
#define ProjectRoot /usr/X11R6
#define XPrintDir   /etc/X11/xserver
#define DlLibrary -lc
#undef XF86SVGAServer
#define XF86SVGAServer NO
#define HasVarDirectory NO
#define HasMotif2 YES
#define HasGhostScript YES
#define InstallXF86EncodingFiles NO

XCOMM #### NetBSD-specifc stuff ... ####
#elif defined(NetBSDArchitecture)
#define ProjectRoot /usr/X11R6
#define XPrintDir   /etc/X11/xserver
#undef XF86SVGAServer   
#define XF86SVGAServer NO 
#define HasVarDirectory NO
#define HasMotif2 YES   
#define HasGhostScript YES
#define InstallXF86EncodingFiles NO

XCOMM #### Linux-specifc stuff ... ####
#elif defined(LinuxArchitecture)
#define ProjectRoot /usr/X11R6
#define XPrintDir   /etc/X11/xserver
#undef XF86SVGAServer
#define XF86SVGAServer NO
#define HasVarDirectory NO
#define HasMotif2 YES
#define HasGhostScript YES
#define InstallXF86EncodingFiles NO
/* Debian Xprint package puts the Xprt config files elsewhere */
#if (LinuxDistribution == LinuxDebian)
# define XPrintDir /usr/share/Xprint/xserver 
#endif

#endif

/* Do not strip binaries to ensure usefull stacktraces in bug reports
 * (http://xprint.mozdev.org/bugs/show_bug.cgi?id=2264)
 */
#define StripInstalledPrograms	NO

/* Does the X11 installation have the Xfree86 encoding files ? */
#ifndef InstallXF86EncodingFiles
#define InstallXF86EncodingFiles YES
#endif /* InstallXF86EncodingFiles */

INSTALLXF86ENCODINGFILES = InstallXF86EncodingFiles

#ifndef XF86EncodingsPath
#define XF86EncodingsPath $(FONTDIR)/encodings
#endif /* XF86EncodingsPath *

/* #########################################################################
 * ################      xprint.mozdev.org defaults end     ################
 * #########################################################################
 */

Index: FreeBSD.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/FreeBSD.cf,v
retrieving revision 1.1.4.7
retrieving revision 1.1.4.8
diff -u -d -r1.1.4.7 -r1.1.4.8
--- a/FreeBSD.cf	15 Apr 2004 10:13:10 -0000	1.1.4.7
+++ b/FreeBSD.cf	21 Apr 2004 10:03:12 -0000	1.1.4.8
@@ -71,7 +71,15 @@
 #define HasNCurses		YES
 #define HasVarRun		YES
 #define HasVarDb		YES
-
+#ifndef HasMotif
+# define HasMotif YES
+#endif /* !HasMotif */
+#ifndef HasMotif2
+# define HasMotif2 YES
+#endif /* !HasMotif2 */
+#ifndef HasGhostScript
+# define HasGhostScript YES
+#endif /* !HasGhostScript */
 #if (OSMajorVersion >= 3)
 #define HasIssetugid		YES
 #define HasPoll			YES

Index: Imake.tmpl
===================================================================
RCS file: /cvs/xorg/xc/config/cf/Imake.tmpl,v
retrieving revision 1.1.4.9
retrieving revision 1.1.4.10
diff -u -d -r1.1.4.9 -r1.1.4.10
--- a/Imake.tmpl	17 Apr 2004 18:47:05 -0000	1.1.4.9
+++ b/Imake.tmpl	21 Apr 2004 10:03:12 -0000	1.1.4.10
@@ -371,6 +371,9 @@
 #ifndef HasMotif
 #define HasMotif		NO
 #endif
+#ifndef HasMotif2
+#define HasMotif2		NO      /* only if system has working Motif2 or OpenMotif */
+#endif
 #ifndef HasBSDAuth
 #define HasBSDAuth		NO
 #endif
@@ -1526,6 +1529,9 @@
 #ifndef GhostScriptCmd
 #define GhostScriptCmd gs
 #endif
+#ifndef HasGhostPCL
+#define HasGhostPCL NO
+#endif
 #ifndef HasGhostScript
 #define HasGhostScript NO
 #endif

Index: NetBSD.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/NetBSD.cf,v
retrieving revision 1.1.4.5
retrieving revision 1.1.4.6
diff -u -d -r1.1.4.5 -r1.1.4.6
--- a/NetBSD.cf	15 Apr 2004 10:13:10 -0000	1.1.4.5
+++ b/NetBSD.cf	21 Apr 2004 10:03:12 -0000	1.1.4.6
@@ -47,6 +47,15 @@
 #ifndef HasLibCrypt
 # define HasLibCrypt		YES
 #endif
+#ifndef HasMotif
+# define HasMotif YES
+#endif /* !HasMotif */
+#ifndef HasMotif2
+# define HasMotif2 YES
+#endif /* !HasMotif2 */
+#ifndef HasGhostScript
+# define HasGhostScript YES
+#endif /* !HasGhostScript */
 #ifndef HasShm
 # if OSMajorVersion == 0 && OSMinorVersion == 9 && OSTeenyVersion == 2
 /*


Index: README
===================================================================
RCS file: /cvs/xorg/xc/config/cf/README,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/README	5 Mar 2004 13:38:11 -0000	1.1.4.4
+++ b/README	21 Apr 2004 10:03:12 -0000	1.1.4.5
@@ -66,11 +66,15 @@
 	HasGcc2			boolean for system has GNU gcc 2.x compiler
 	HasGcc2ForCplusplus	use gcc 2 for C++ programs?
 	HasGnuMake		use the GNU make program?
+        HasGhostPCL             boolean for system has GhostPCL
+        HasGhostScript          boolean for system has GhostScript
 	HasKrbIV		system has Kerberos version IV support?
 	HasKrb5			system has Kerberos version 5 support?
 	HasLargeTmp		boolean for system has /tmp space
 	HasLatex		system has LaTeX document preparation software
 	HasLibCrypt		boolean for system has libcrypt
+        HasMotif                boolean for system has Motif
+        HasMotif2               boolean for system has Motif2 or OpenMotif
 	HasNdbm			boolean for system has ndbm routines
 	HasPoll			use poll() syscall?
 	HasPurify		boolean for system has Purify
@@ -322,6 +326,12 @@
 	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
@@ -452,10 +462,6 @@
 	HasShadowPasswd		system has getspnam() function
 	XnestServer		build X server with Xlib-based ddx
 	XVirtualFramebufferServer	build X server with virtual memory framebuffer
-	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
 	WebServer		host:port of your Web server (see programs/xrx)
 	HtmlDir			path used by Web server for HTML and RX docs
 	CgiBinDir		path used by Web server for CGI programs

Index: WinLib.tmpl
===================================================================
RCS file: /cvs/xorg/xc/config/cf/WinLib.tmpl,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/WinLib.tmpl	5 Mar 2004 13:38:11 -0000	1.1.4.3
+++ b/WinLib.tmpl	21 Apr 2004 10:03:12 -0000	1.1.4.4
@@ -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.12
retrieving revision 1.1.4.13
diff -u -d -r1.1.4.12 -r1.1.4.13
--- a/X11.tmpl	15 Apr 2004 10:13:10 -0000	1.1.4.12
+++ b/X11.tmpl	21 Apr 2004 10:03:12 -0000	1.1.4.13
@@ -462,6 +462,24 @@
 #ifndef XprtServer
 #define XprtServer		BuildServer
 #endif
+#ifndef XpRasterDDX
+#define XpRasterDDX             YES
+#endif
+#ifndef XpColorPclDDX
+#define XpColorPclDDX           YES
+#endif
+#ifndef XpMonoPclDDX
+#define XpMonoPclDDX            YES
+#endif
+#ifndef XpPostScriptDDX
+#define XpPostScriptDDX         YES
+#endif
+#ifndef XpPdfDDX
+#define XpPdfDDX                YES
+#endif
+#ifndef XpSvgDDX
+#define XpSvgDDX                YES
+#endif
 #ifndef BuildXprint
 #if XprtServer
 #define BuildXprint		YES
@@ -470,7 +488,7 @@
 #endif
 #endif
 #ifndef BuildXprintLib
-#define BuildXprintLib		(BuildXprint && !BuildServersOnly)
+#define BuildXprintLib		!BuildServersOnly
 #endif
 #ifndef BuildScreenSaverExt
 #define BuildScreenSaverExt	NO
@@ -3665,10 +3683,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
@@ -4093,6 +4111,37 @@
 #endif
 #endif
 
+/* 
+ * InstallXpPMFLink - install link for a Xprint PMF "font" from one
+ * print model to another
+ */
+#ifndef InstallXpPMFLink
+#define InstallXpPMFLink(fontfilename,srcmodelfontdir,destmodelfontdir)				@@\
+	InstallLink(install,srcmodelfontdir/fontfilename,fontfilename,destmodelfontdir)
+#endif /* InstallXpPMFLink */
+/* 
+ * InstallXpMultiplePMFLinks - install multiple links for PMF fonts
+ * from one print model to another
+ */
+#ifndef InstallXpMultiplePMFLinks
+#define InstallXpMultiplePMFLinks(list,srcmodelfontdir,destmodelfontdir)			@@\
+install::											@@\
+	MakeDir($(DESTDIR)destmodelfontdir)							@@\
+	for i in list ; do \									@@\
+	    $(RM) $(DESTDIR)destmodelfontdir/$$i ; \						@@\
+	    $(LN) -s -f srcmodelfontdir/$$i $(DESTDIR)destmodelfontdir/$$i ; \			@@\
+	done
+#endif /* InstallXpPMFLink */
+
+/*
+ * InstallXpPMFFontsDir - make and install a fonts.dir index for model-config fonts
+ */
+#ifndef InstallXpPMFFontsDir
+#define InstallXpPMFFontsDir(destmodelfontdir)			@@\
+install::							@@\
+	(cd $(DESTDIR)destmodelfontdir ; $(DESTDIR)$(BINDIR)/mkfontscale -b -s -l)
+#endif /* InstallXpPMFFontsDir */
+
 
 /*
  * MakeXkbDir

Index: bsdLib.tmpl
===================================================================
RCS file: /cvs/xorg/xc/config/cf/bsdLib.tmpl,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/bsdLib.tmpl	5 Mar 2004 13:38:11 -0000	1.1.4.3
+++ b/bsdLib.tmpl	21 Apr 2004 10:03:12 -0000	1.1.4.4
@@ -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.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/bsdiLib.tmpl	5 Mar 2004 13:38:11 -0000	1.1.4.2
+++ b/bsdiLib.tmpl	21 Apr 2004 10:03:12 -0000	1.1.4.3
@@ -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.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/cygwin.tmpl	5 Mar 2004 13:38:11 -0000	1.1.4.4
+++ b/cygwin.tmpl	21 Apr 2004 10:03:12 -0000	1.1.4.5
@@ -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.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/darwinLib.tmpl	5 Mar 2004 13:38:11 -0000	1.1.4.2
+++ b/darwinLib.tmpl	21 Apr 2004 10:03:12 -0000	1.1.4.3
@@ -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.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/gnuLib.tmpl	5 Mar 2004 13:38:11 -0000	1.1.4.2
+++ b/gnuLib.tmpl	21 Apr 2004 10:03:12 -0000	1.1.4.3
@@ -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.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/hpLib.tmpl	5 Mar 2004 13:38:11 -0000	1.1.4.2
+++ b/hpLib.tmpl	21 Apr 2004 10:03:12 -0000	1.1.4.3
@@ -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.5
retrieving revision 1.1.4.6
diff -u -d -r1.1.4.5 -r1.1.4.6
--- a/ibmLib.tmpl	5 Mar 2004 13:38:11 -0000	1.1.4.5
+++ b/ibmLib.tmpl	21 Apr 2004 10:03:12 -0000	1.1.4.6
@@ -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: linux.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/linux.cf,v
retrieving revision 1.1.4.8
retrieving revision 1.1.4.9
diff -u -d -r1.1.4.8 -r1.1.4.9
--- a/linux.cf	15 Apr 2004 10:13:10 -0000	1.1.4.8
+++ b/linux.cf	21 Apr 2004 10:03:12 -0000	1.1.4.9
@@ -206,6 +206,16 @@
 # endif
 #endif
 
+#ifndef HasMotif
+# define HasMotif YES
+#endif /* !HasMotif */
+#ifndef HasMotif2
+# define HasMotif2 YES
+#endif /* !HasMotif2 */
+#ifndef HasGhostScript
+# define HasGhostScript YES
+#endif /* !HasGhostScript */
+
 #if LinuxCLibMajorVersion >= 6
 # define LinuxSourceDefines	-D_POSIX_C_SOURCE=199309L \
 				-D_POSIX_SOURCE -D_XOPEN_SOURCE \
@@ -452,7 +462,9 @@
 # endif
 #endif
 #define HasPutenv		YES
-#define HasShm			YES
+#ifndef HasShm
+# define HasShm			YES
+#endif
 #define HasSockets		YES
 #if UseElfFormat || defined(AlphaArchitecture)
 #ifndef HasSnprintf

Index: lnxLib.tmpl
===================================================================
RCS file: /cvs/xorg/xc/config/cf/lnxLib.tmpl,v
retrieving revision 1.1.4.5
retrieving revision 1.1.4.6
diff -u -d -r1.1.4.5 -r1.1.4.6
--- a/lnxLib.tmpl	5 Mar 2004 13:38:11 -0000	1.1.4.5
+++ b/lnxLib.tmpl	21 Apr 2004 10:03:12 -0000	1.1.4.6
@@ -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.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/os2Lib.tmpl	5 Mar 2004 13:38:11 -0000	1.1.4.4
+++ b/os2Lib.tmpl	21 Apr 2004 10:03:12 -0000	1.1.4.5
@@ -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.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/osfLib.tmpl	5 Mar 2004 13:38:11 -0000	1.1.4.3
+++ b/osfLib.tmpl	21 Apr 2004 10:03:12 -0000	1.1.4.4
@@ -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.5
retrieving revision 1.1.4.6
diff -u -d -r1.1.4.5 -r1.1.4.6
--- a/sco5.cf	15 Apr 2004 10:13:10 -0000	1.1.4.5
+++ b/sco5.cf	21 Apr 2004 10:03:12 -0000	1.1.4.6
@@ -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: sun.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/sun.cf,v
retrieving revision 1.1.4.13
retrieving revision 1.1.4.14
diff -u -d -r1.1.4.13 -r1.1.4.14
--- a/sun.cf	18 Apr 2004 03:00:42 -0000	1.1.4.13
+++ b/sun.cf	21 Apr 2004 10:03:12 -0000	1.1.4.14
@@ -532,6 +532,15 @@
 #define PamLibraries		-lpam
 #endif
 
+#ifndef HasMotif
+# define HasMotif YES
+#endif /* !HasMotif */
+#ifndef HasMotif2
+/* Solaris's Motif2 version is broken and misses XmPrintShell
+ * (see http://xprint.mozdev.org/bugs/show_bug.cgi?id=1366) */
+# define HasMotif2 NO
+#endif /* !HasMotif2 */
+
 #define MotifDefines			\
 	-DNO_ISDIR -DNO_REGCOMP -DNO_ALLOCA -DBOGUS_MB_MAX -DNO_CONST
 #define PamUnixDefines		-DPAM_NIS


Index: sv4Lib.tmpl
===================================================================
RCS file: /cvs/xorg/xc/config/cf/sv4Lib.tmpl,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/sv4Lib.tmpl	5 Mar 2004 13:38:11 -0000	1.1.4.3
+++ b/sv4Lib.tmpl	21 Apr 2004 10:03:12 -0000	1.1.4.4
@@ -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


