xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/xaa/Makefile.am |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 4c4e06af7950df509fa02099788be66cf37a4d01
Author: Paul Bender <pebender at gmail.com>
Date:   Tue Jun 24 10:44:47 2008 -0400

    Bug #15665: Fix building without Composite.

diff --git a/hw/xfree86/xaa/Makefile.am b/hw/xfree86/xaa/Makefile.am
index 58c8e88..bd8267a 100644
--- a/hw/xfree86/xaa/Makefile.am
+++ b/hw/xfree86/xaa/Makefile.am
@@ -9,7 +9,9 @@ MSB_3_FIXED = mf3-xaaBitmap.c mf3-xaaStipple.c
 POLYSEG = s-xaaLine.c s-xaaDashLine.c
 
 libxaa_la_LDFLAGS = -avoid-version
+if COMPOSITE
 libxaa_la_LIBADD = $(top_builddir)/miext/cw/libcw.la
+endif
 
 module_LTLIBRARIES = libxaa.la
 libxaa_la_SOURCES = xaaInit.c xaaGC.c xaaInitAccel.c xaaFallback.c \