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:49:19 -0700 |
| commit | 6d3d344b5b95b6dc4166556d03cfd8c9576dc3f0 (patch) | |
| tree | 22d37d4899ee646d852e3aa8903359976aa0f3ea | |
| parent | 180ec128adef11a9a90cea1189dc31ac5de8359f (diff) | |
XQuartz: Don't use composite.
| -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 87785a568..125f1f33a 100644 --- a/configure.ac +++ b/configure.ac @@ -495,7 +495,7 @@ AC_ARG_ENABLE(glx-tls, AS_HELP_STRING([--enable-glx-tls], [Build GLX with [GLX_USE_TLS=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]) @@ -694,6 +694,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 652356180..f6ede8b18 100644 --- a/hw/xquartz/xpr/Makefile.am +++ b/hw/xquartz/xpr/Makefile.am @@ -27,7 +27,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 \ |