[xorg-commit-diffs] xc/config/cf X11.tmpl,1.1.4.8,1.1.4.8.2.1

[Stuart Kreitman]

Committed by: stukreit

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

Modified Files:
      Tag: DAMAGE-XFIXES
	X11.tmpl 
Log Message:
integration from modular tree.
Modified Files:
 Tag: DAMAGE-XFIXES
	X11.tmpl 


Index: X11.tmpl
===================================================================
RCS file: /cvs/xorg/xc/config/cf/X11.tmpl,v
retrieving revision 1.1.4.8
retrieving revision 1.1.4.8.2.1
diff -u -d -r1.1.4.8 -r1.1.4.8.2.1
--- a/X11.tmpl	5 Mar 2004 13:38:11 -0000	1.1.4.8
+++ b/X11.tmpl	30 Mar 2004 19:37:16 -0000	1.1.4.8.2.1
@@ -581,6 +581,20 @@
 #define BuildRandRLibrary	!BuildServersOnly
 #endif
 
+#ifndef BuildXfixes
+#define BuildXfixes		YES
+#endif
+#ifndef BuildXfixesLibrary
+#define BuildXfixesLibrary	!BuildServersOnly
+#endif
+
+#ifndef BuildDamage
+#define BuildDamage		YES
+#endif
+#ifndef BuildDamageLibrary
+#define BuildDamageLibrary	!BuildServersOnly
+#endif
+
 #ifndef BuildXcursorLibrary
 #define BuildXcursorLibrary	BuildRenderLibrary
 #endif
@@ -1096,6 +1110,22 @@
 #endif
 #endif
 
+#ifndef XfixesDefines
+#if BuildXfixes
+#define XfixesDefines -DXFIXES
+#else
+#define XfixesDefines /**/
+#endif
+#endif
+
+#ifndef XDamageDefines
+#if BuildDamage
+#define XDamageDefines -DDAMAGE
+#else
+#define XDamageDefines /**/
+#endif
+#endif
+
 #ifndef SitePervasiveExtensionDefines
 #define SitePervasiveExtensionDefines /**/
 #endif
@@ -1105,7 +1135,8 @@
 	XCSecurityDefines CupDefines PervasiveDBEDefines \
 	XF86BigfontExtensionDefines DPMSDefines \
 	LowMemDefines XprintDefines XineramaDefines \
-	SitePervasiveExtensionDefines RenderDefines RandRDefines
+	SitePervasiveExtensionDefines RenderDefines RandRDefines \
+	XfixesDefines XDamageDefines
 #endif
 #ifndef SiteExtensionDefines
 #define SiteExtensionDefines /**/
@@ -2086,6 +2117,30 @@
 #define ProfileLibXrandr	NO
 #endif
 
+#if BuildDamageLibrary
+#ifndef SharedLibXdamage
+#define SharedLibXdamage	HasSharedLibraries
+#endif
+#ifndef NormalLibXdamage
+#define NormalLibXdamage	(!SharedLibXdamage || ForceNormalLib)
+#endif
+#ifndef DebugLibXdamage
+#define DebugLibXdamage		NO
+#endif
+#ifndef ProfileLibXdamage
+#define ProfileLibXdamage	NO
+#endif
+#else
+#undef  SharedLibXdamage
+#define SharedLibXdamage	NO
+#undef  NormalLibXdamage
+#define NormalLibXdamage	NO
+#undef  DebugLibXdamage
+#define DebugLibXdamage		NO
+#undef  ProfileLibXdamage
+#define ProfileLibXdamage	NO
+#endif
+
 #if BuildXcursorLibrary
 #ifndef SharedLibXcursor
 #define SharedLibXcursor	HasSharedLibraries