summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@apple.com>2011-05-29 01:04:32 -0700
committerJeremy Huddleston <jeremyhu@apple.com>2011-05-30 01:11:48 -0700
commitf08450ddeb453cf1347973f2d44957bccc23bac4 (patch)
tree9ccd0951ecd3a06aea4d1141fe030cc442994380
parent14c20aeb9efcfcdb63e185b27000adac5fe3b705 (diff)
XQuartz: Enable COMPOSITExquartz-composite
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
-rw-r--r--configure.ac2
-rw-r--r--hw/xquartz/mach-startup/Makefile.am1
2 files changed, 2 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 146da8062..b95e0b0d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -757,7 +757,7 @@ case $host_os in
XVFB=no
XNEST=no
- COMPOSITE=no
+ COMPOSITE=yes
DGA=no
DPMSExtension=no
XF86VIDMODE=no
diff --git a/hw/xquartz/mach-startup/Makefile.am b/hw/xquartz/mach-startup/Makefile.am
index 4b7b2bce3..c5fb8ba1d 100644
--- a/hw/xquartz/mach-startup/Makefile.am
+++ b/hw/xquartz/mach-startup/Makefile.am
@@ -22,6 +22,7 @@ X11_bin_LDADD = \
$(top_builddir)/dix/dixfonts.lo \
$(top_builddir)/miext/rootless/librootless.la \
$(top_builddir)/hw/xquartz/pbproxy/libxpbproxy.la \
+ $(top_builddir)/composite/libcomposite.la \
$(DARWIN_LIBS) $(MAIN_LIB) $(XSERVER_LIBS)
X11_bin_LDFLAGS = \