diff -ruN xserver-old/configure.ac xserver/configure.ac
diff -ruN xserver-old/mi/miinitext.c xserver/mi/miinitext.c
--- xserver-old/mi/miinitext.c	2006-06-27 12:50:14.000000000 +1000
+++ xserver/mi/miinitext.c	2006-07-11 01:54:29.000000000 +1000
@@ -108,6 +108,7 @@
 #undef XF86DRI
 #undef DPMSExtension
 #undef FONTCACHE
+#undef COMPOSITE
 #undef DAMAGE
 #undef XFIXES
 #undef XEVIE