[xorg-commit-diffs] xc/config/cf X11.tmpl, 1.1.4.7.2.10, 1.1.4.7.2.10.2.1

[Alexander Gelfenbain]

Committed by: adg

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

Modified Files:
      Tag: XORG-RELEASE-1-STSF
	X11.tmpl 
Log Message:
Initial import of XST into the XORG-RELEASE-1-STSF branch

Index: X11.tmpl
===================================================================
RCS file: /cvs/xorg/xc/config/cf/X11.tmpl,v
retrieving revision 1.1.4.7.2.10
retrieving revision 1.1.4.7.2.10.2.1
diff -u -d -r1.1.4.7.2.10 -r1.1.4.7.2.10.2.1
--- a/X11.tmpl	2 Apr 2004 21:47:10 -0000	1.1.4.7.2.10
+++ b/X11.tmpl	6 Apr 2004 02:41:19 -0000	1.1.4.7.2.10.2.1
@@ -569,6 +569,18 @@
 #ifndef BuildRenderLibrary
 #define BuildRenderLibrary	!BuildServersOnly
 #endif
+#ifndef BuildXstLibrary
+#define BuildXstLibrary		YES
+#ifndef Buildxstls
+#define Buildxstls		YES
+#endif
+#ifndef Buildxstshowfont
+#define Buildxstshowfont        YES
+#endif
+#endif
+#ifndef BuildXst
+#define BuildXst                YES
+#endif
 #ifndef BuildXftLibrary
 #define BuildXftLibrary		BuildRenderLibrary
 #endif
@@ -1112,6 +1124,14 @@
 #endif
 #endif
 
+
+#ifndef XstDefines
+#if BuildXst
+#define XstDefines -DXST
+#else
+#define XstDefines /**/
+#endif
+#endif
 #ifndef RenderDefines
 #if BuildRender
 #define RenderDefines -DRENDER
@@ -3270,6 +3290,34 @@
 #endif
 #endif
 
+#ifndef SharedLibXst
+#define SharedLibXst HasSharedLibraries
+#endif
+#ifndef NormalLibXst
+#define NormalLibXst (!SharedLibXst | ForceNormalLib)
+#endif
+#ifndef DebugLibXst
+#define DebugLibXst		NO
+#endif
+#ifndef ProfileLibXst
+#define ProfileLibXst		NO
+#endif
+          XSTLIBSRC = $(LIBSRC)/Xst
+#if SharedLibXst
+#ifndef SharedXstRev
+#define SharedXstRev 0.7
+#endif
+SharedLibReferences(XST,Xst,$(XSTLIBSRC),SOXSTREV,1)
+#else
+ProjectUnsharedLibReferences(XST,Xst,$(XSTLIBSRC),XBuildLibDir)
+#endif
+
+#ifndef XstClientDepLibs
+#define XstClientDepLibs $(DEPXSTLIB) 
+#endif
+#ifndef XstClientLibs
+#define XstClientLibs $(XSTLIB) -L$(TOP)/../stsf/stsflib -lstsf
+#endif
 #ifndef SharedLibXft
 #define SharedLibXft HasSharedLibraries
 #endif