isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-18 06:04:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

reviewed by: Thomas Thurman

Browse Source 
* configure.in: only accept --enable-compositor if we find we can
	  actually composite.


svn path=/trunk/; revision=4028
This commit is contained in:
Thomas James Alexander Thurman 2008-11-23 20:23:57 +00:00
parent e146c24483
commit 88cd978837
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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> 2008-11-23 Thomas Thurman <tthurman@gnome.org>
* src/core/display.c: remove apparently spurious warnings about * src/core/display.c: remove apparently spurious warnings about

20
configure.in
View File

@ -211,17 +211,8 @@ fi
have_xrender=no have_xrender=no
XCOMPOSITE_VERSION=0.2 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 if test x$enable_compositor = xyes; then
have_xcomposite=yes have_xcomposite=yes
echo "CompositeExt support forced on"
elif test x$enable_compositor = xauto; then elif test x$enable_compositor = xauto; then
echo "Building compositing manager by default now." echo "Building compositing manager by default now."
have_xcomposite=yes have_xcomposite=yes
@ -230,9 +221,18 @@ else
fi fi
if test x$have_xcomposite = xyes; then 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" METACITY_PC_MODULES="$METACITY_PC_MODULES xcomposite >= $XCOMPOSITE_VERSION xfixes xrender xdamage"
AC_DEFINE(HAVE_COMPOSITE_EXTENSIONS, , [Building with compositing manager support]) AC_DEFINE(HAVE_COMPOSITE_EXTENSIONS, , [Building with compositing manager support])
echo "Building with compositing manager"
## force on render also ## force on render also
have_xrender=yes have_xrender=yes