diff options
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 43 |
1 files changed, 42 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 597882f6..e1f4637e 100644 --- a/configure.in +++ b/configure.in @@ -131,6 +131,8 @@ AC_ARG_ENABLE(compositor, [ --disable-compositor disable metacity AC_ARG_ENABLE(xsync, [ --disable-xsync disable metacity's use of the XSync extension],,enable_xsync=auto) +AC_ARG_ENABLE(render, [ --disable-render disable metacity's use of the RENDER extension],,enable_render=auto) + AC_ARG_ENABLE(shape, [ --disable-shape disable metacity's use of the shaped window extension],,enable_shape=auto) ## try definining HAVE_BACKTRACE @@ -179,6 +181,10 @@ else echo "Building without libstartup-notification" fi +## init this, it gets set either in the compositor check below +## or the render-specific check later +have_xrender=no + XCOMPOSITE_VERSION=1.0 AC_MSG_CHECKING([Xcomposite >= $XCOMPOSITE_VERSION]) if $PKG_CONFIG --atleast-version $XCOMPOSITE_VERSION xcomposite; then @@ -192,7 +198,8 @@ if test x$enable_compositor = xyes; then have_xcomposite=yes echo "CompositeExt support forced on" elif test x$enable_compositor = xauto; then - true + echo "Not building compositing manager by default now, must enable explicitly to get it. And it doesn't work, so don't bother unless you want to hack on it..." + have_xcomposite=no else have_xcomposite=no fi @@ -201,10 +208,43 @@ if test x$have_xcomposite = xyes; then echo "Building with CompositeExt" METACITY_PC_MODULES="$METACITY_PC_MODULES xcomposite >= $XCOMPOSITE_VERSION xfixes xrender xdamage" AC_DEFINE(HAVE_COMPOSITE_EXTENSIONS, , [Building with compositing manager support]) + + ## force on render also + have_xrender=yes else echo "Building without compositing manager" fi +## if no compositor, still possibly enable render +if test x$have_xcomposite = xno; then + XRENDER_VERSION=0.0 + AC_MSG_CHECKING([xrender >= $XRENDER_VERSION]) + if $PKG_CONFIG --atleast-version $XRENDER_VERSION xrender; then + have_xrender=yes + else + have_xrender=no + fi + AC_MSG_RESULT($have_xrender) + + if test x$enable_render = xyes; then + have_xrender=yes + echo "Render support forced on" + elif test x$enable_render = xauto; then + true + else + have_xrender=no + fi + + if test x$have_xrender = xyes; then + echo "Building with Render" + METACITY_PC_MODULES="$METACITY_PC_MODULES xrender >= $XRENDER_VERSION" + fi +fi ## have_composite + +if test x$have_xrender = xyes; then + AC_DEFINE(HAVE_RENDER, , [Building with Render extension support]) +fi + PKG_CHECK_MODULES(METACITY, $METACITY_PC_MODULES) AC_PATH_XTRA @@ -439,6 +479,7 @@ metacity-$VERSION: Shape extension: ${found_shape} Resize-and-rotate: ${found_randr} Xsync: ${found_xsync} + Render: ${have_xrender} Deprecated config dialog: ${enable_config_dialog} " echo "This is the UNSTABLE branch of metacity, use 2.8.1.x for stable (gnome-2-6 branch in CVS)" |