diff options
| author | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2008-04-16 21:49:19 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2008-04-16 21:51:13 -0700 |
| commit | 13f6f3823ec52bfb7c34e9c26b8bf7fbd9301d49 (patch) | |
| tree | 531868b54ced72e2e1457beaa24e1b75e0498c6f | |
| parent | 4c17797b652661e295add635a11522bb913e00fd (diff) | |
XQuartz: Don't use composite.
(cherry picked from commit 6d3d344b5b95b6dc4166556d03cfd8c9576dc3f0)
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | hw/xquartz/xpr/Makefile.am | 1 |
2 files changed, 9 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index f02e4783b..0c116f7ef 100644 --- a/configure.ac +++ b/configure.ac @@ -482,7 +482,7 @@ AC_ARG_ENABLE(install-libxf86config, [INSTALL_LIBXF86CONFIG=no]) dnl Extensions. -AC_ARG_ENABLE(composite, AS_HELP_STRING([--disable-composite], [Build Composite extension (default: enabled)]), [COMPOSITE=$enableval], [COMPOSITE=yes]) +AC_ARG_ENABLE(composite, AS_HELP_STRING([--disable-composite], [Build Composite extension (default: enabled)]), [COMPOSITE=$enableval], [COMPOSITE=auto]) AC_ARG_ENABLE(mitshm, AS_HELP_STRING([--disable-shm], [Build SHM extension (default: enabled)]), [MITSHM=$enableval], [MITSHM=yes]) AC_ARG_ENABLE(xres, AS_HELP_STRING([--disable-xres], [Build XRes extension (default: enabled)]), [RES=$enableval], [RES=yes]) AC_ARG_ENABLE(xtrap, AS_HELP_STRING([--disable-xtrap], [Build XTrap extension (default: enabled)]), [XTRAP=$enableval], [XTRAP=yes]) @@ -626,6 +626,14 @@ if test "x$XVMC" = xyes; then AC_DEFINE(XvMCExtension, 1, [Build XvMC extension]) fi +dnl XQuartz DDX Detection... Yes, it's ugly to have it here... but we need to disable COMPOSITE for +if test "x$COMPOSITE" = xauto; then + case $host_os in + darwin*) + [ "x$XQUARTZ" = xyes -o "x$XQUARTZ" = xauto ] && COMPOSITE=no + ;; + esac +fi AM_CONDITIONAL(COMPOSITE, [test "x$COMPOSITE" = xyes]) if test "x$COMPOSITE" = xyes; then diff --git a/hw/xquartz/xpr/Makefile.am b/hw/xquartz/xpr/Makefile.am index 9b82c55cf..666759a40 100644 --- a/hw/xquartz/xpr/Makefile.am +++ b/hw/xquartz/xpr/Makefile.am @@ -26,7 +26,6 @@ Xquartz_LDADD = \ $(top_builddir)/miext/shadow/libshadow.la \ $(top_builddir)/fb/libfb.la \ $(top_builddir)/mi/libmi.la \ - $(top_builddir)/composite/libcomposite.la \ $(top_builddir)/damageext/libdamageext.la \ $(top_builddir)/miext/damage/libdamage.la \ $(top_builddir)/xfixes/libxfixes.la \ |