STSF-CURRENT: xorg/xc/config/cf
jhobson
freedesktop-cvs-commits at pdx.freedesktop.org
Sat Mar 27 01:18:41 EET 2004
CVS commit by jhobson:
Committing in STSF-CURRENT
Modified Files:
Tag: STSF-CURRENT
X11.tmpl
----------------------------------------------------------------------
M +49 -0 xorg/xc/config/cf/X11.tmpl 1.1.1.8.2.1
--- xorg/xc/config/cf/X11.tmpl #1.1.1.8:1.1.1.8.2.1
@@ -538,4 +538,16 @@
#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
@@ -1072,4 +1084,12 @@
#endif
+#ifndef XstDefines
+#if BuildXst
+#define XstDefines -DXST
+#else
+#define XstDefines /**/
+#endif
+#endif
+
#ifndef RenderDefines
#if BuildRender
@@ -3209,4 +3229,33 @@
#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
More information about the xorg-commit
mailing list