From fcaa6f30c489578589af19ef798ab31150e696a2 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Sun, 7 Aug 2005 19:02:32 +0000 Subject: [PATCH] Bug #3989: Fix Composite builds, enable Composite build by default. (Olli Helenius) --- ChangeLog | 7 +++++++ configure.ac | 2 +- miext/damage/Makefile.am | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6314d91bd..31e88d18c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-08-07 Adam Jackson + + * configure.ac: + * miext/damage/Makefile.am: + Bug #3989: Fix Composite builds, enable Composite build by default. + (Olli Helenius) + 2005-08-04 Adam Jackson * hw/xfree86/common/Makefile.am: diff --git a/configure.ac b/configure.ac index e78286dd2..421e14c80 100644 --- a/configure.ac +++ b/configure.ac @@ -171,7 +171,7 @@ AC_DEFINE(XORG_SERVER, 1, [Build X.Org X server]) m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) AC_ARG_ENABLE(werror, [ --enable-werror ],[WERROR=$enableval],[WERROR=no]) -AC_ARG_ENABLE(composite, [ --enable-composite ],[COMPOSITE=$enableval],[COMPOSITE=no]) +AC_ARG_ENABLE(composite, [ --enable-composite ],[COMPOSITE=$enableval],[COMPOSITE=yes]) AC_ARG_ENABLE(mitshm, [ --disable-shm ],[MITSHM=$enableval],[MITSHM=yes]) AC_ARG_ENABLE(xres, [ --disable-xres ],[RES=$enableval],[RES=yes]) AC_ARG_ENABLE(xtrap, [ --enable-xtrap ],[XTRAP=$enableval],[XTRAP=no]) diff --git a/miext/damage/Makefile.am b/miext/damage/Makefile.am index 1fe137fc3..093b4587f 100644 --- a/miext/damage/Makefile.am +++ b/miext/damage/Makefile.am @@ -2,6 +2,8 @@ noinst_LTLIBRARIES = libdamage.la AM_CFLAGS = $(DIX_CFLAGS) +INCLUDES = -I$(srcdir)/../cw + libdamage_la_SOURCES = \ damage.c \ damage.h \