aboutsummaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorTomas Frydrych <tf@linux.intel.com>2008-02-13 17:04:52 +0000
committerTomas Frydrych <tf@linux.intel.com>2008-02-13 17:04:52 +0000
commitdc63f21734715453d3ac1ec5627a0dec39d224ea (patch)
treef68b5e93336e5f68fdca60abd63a3d65809399b2 /configure.ac
parent71bf39a6c4ec716820df171056d9f07d38370983 (diff)
downloadlibmatchboxwm2-dc63f21734715453d3ac1ec5627a0dec39d224ea.tar.gz
libmatchboxwm2-dc63f21734715453d3ac1ec5627a0dec39d224ea.tar.bz2
libmatchboxwm2-dc63f21734715453d3ac1ec5627a0dec39d224ea.zip
2008-02-13 Tomas Frydrych <tf@o-hand.com>
* configure.ac * src/comp-mgr/Makefile.am: * src/comp-mgr/mb-wm-comp-mgr-default.c: * src/comp-mgr/mb-wm-comp-mgr-default.h: * src/comp-mgr/mb-wm-comp-mgr.c: * src/comp-mgr/mb-wm-comp-mgr.h: * src/core/mb-window-manager.c: * src/core/mb-window-manager.h: * src/core/mb-wm-client.c: * src/core/mb-wm-main-context.c: * src/core/mb-wm-object-props.h: * src/core/mb-wm-types.h: * src/managers/maemo/maemo-window-manager.c: * src/managers/simple/matchbox-window-manager-2-simple.c: Changes to improve the flexibility of the compositor framework. Framework for compositor effects. Initial implementation of a clutter-based compositor. * src/theme-engines/mb-wm-theme-xml.c: * src/theme-engines/mb-wm-theme-xml.h: * src/theme-engines/mb-wm-theme.c: * src/theme-engines/mb-wm-theme.h: Added support for effects. * data/themes/Default/theme.xml: Added sample effect for application clients.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac22
1 files changed, 17 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index 6c80220..cb89a68 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,9 +50,16 @@ if test "x$use_gtk" = "xyes"; then
needed_pkgs="$needed_pkgs gtk+-2.0 "
fi
-if test "x$comp_mgr" = "xyes"; then
- needed_pkgs="$needed_pkgs xcomposite xdamage "
-fi
+case $comp_mgr in
+ yes | default ) comp_mgr="yes (default)"
+ needed_pkgs="$needed_pkgs xcomposite xdamage " ;;
+
+ clutter ) comp_mgr="yes (clutter)"
+ needed_pkgs="$needed_pkgs clutter-0.5 xcomposite xdamage "
+ gmloop="yes" ;;
+
+ * ) comp_mgr = no ;;
+esac
if test "x$want_debug" = "xyes"; then
MBWM_DEBUG_CFLAGS="-O0 $MBWM_DEBUG_CFLAGS -DMBWM_WANT_DEBUG"
@@ -85,11 +92,16 @@ if test "$use_gtk" = yes; then
AC_DEFINE(USE_GTK, 1, [GTK Integration])
fi
-AM_CONDITIONAL(ENABLE_COMPOSITE, [test "x$comp_mgr" = "xyes"])
-if test "$comp_mgr" = yes; then
+AM_CONDITIONAL(ENABLE_COMPOSITE, [test "x$comp_mgr" != "xno"])
+if test "$comp_mgr" != no; then
AC_DEFINE(ENABLE_COMPOSITE, 1, [Enable composite manager code])
fi
+AM_CONDITIONAL(USE_CLUTTER, [test "x$comp_mgr" = "xyes (clutter)"])
+if test "$comp_mgr" = "yes (clutter)"; then
+ AC_DEFINE(USE_CLUTTER, 1, [Use clutter for compositing])
+fi
+
AC_ARG_ENABLE(simple-manager,
[ --disable-simple-manager Do not build simple window manager],
[simple_manager=$enableval], [simple_manager=yes])