diff options
| author | Thomas James Alexander Thurman <tthurman@src.gnome.org> | 2008-11-23 20:23:57 +0000 |
|---|---|---|
| committer | Thomas James Alexander Thurman <tthurman@src.gnome.org> | 2008-11-23 20:23:57 +0000 |
| commit | 88cd9788372947171c38330bbcd09466eb0b1336 (patch) | |
| tree | cf9aa84bbced5290664c2d5be82e34dafb9ea07d | |
| parent | e146c24483360c043f8733ae915e3e0c7784e201 (diff) | |
| download | metacity-88cd9788372947171c38330bbcd09466eb0b1336.tar.gz | |
reviewed by: Thomas Thurman
* configure.in: only accept --enable-compositor if we find we can
actually composite.
svn path=/trunk/; revision=4028
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.in | 20 |
2 files changed, 17 insertions, 10 deletions
@@ -1,3 +1,10 @@ +2008-11-23 Daniel Macks <dmacks@netspace.org> + + reviewed by: Thomas Thurman + + * configure.in: only accept --enable-compositor if we find we can + actually composite. + 2008-11-23 Thomas Thurman <tthurman@gnome.org> * src/core/display.c: remove apparently spurious warnings about diff --git a/configure.in b/configure.in index 9e3569da..0ce86198 100644 --- a/configure.in +++ b/configure.in @@ -211,17 +211,8 @@ fi have_xrender=no XCOMPOSITE_VERSION=0.2 -AC_MSG_CHECKING([Xcomposite >= $XCOMPOSITE_VERSION]) -if $PKG_CONFIG --atleast-version $XCOMPOSITE_VERSION xcomposite; then - have_xcomposite=yes -else - have_xcomposite=no -fi -AC_MSG_RESULT($have_xcomposite) - if test x$enable_compositor = xyes; then have_xcomposite=yes - echo "CompositeExt support forced on" elif test x$enable_compositor = xauto; then echo "Building compositing manager by default now." have_xcomposite=yes @@ -230,9 +221,18 @@ else fi if test x$have_xcomposite = xyes; then - echo "Building with CompositeExt" + AC_MSG_CHECKING([Xcomposite >= $XCOMPOSITE_VERSION]) + if $PKG_CONFIG --atleast-version $XCOMPOSITE_VERSION xcomposite; then + AC_MSG_RESULT([yes]) + else + AC_MSG_ERROR([no. Use --disable-compositor to disable.]) + fi +fi + +if test x$have_xcomposite = xyes; then METACITY_PC_MODULES="$METACITY_PC_MODULES xcomposite >= $XCOMPOSITE_VERSION xfixes xrender xdamage" AC_DEFINE(HAVE_COMPOSITE_EXTENSIONS, , [Building with compositing manager support]) + echo "Building with compositing manager" ## force on render also have_xrender=yes |