aboutsummaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorTomas Frydrych <tf@linux.intel.com>2007-11-01 09:17:48 +0000
committerTomas Frydrych <tf@linux.intel.com>2007-11-01 09:17:48 +0000
commit4177fd50ce833b0d777db2edd5b1dc00d21fdfea (patch)
tree7427e39e5a93df0e8cf8811c7b5ad8914ed630f0 /configure.ac
parente94dcabeee46e0fb799fe64dfe2b04a046b06205 (diff)
downloadlibmatchboxwm2-4177fd50ce833b0d777db2edd5b1dc00d21fdfea.tar.gz
libmatchboxwm2-4177fd50ce833b0d777db2edd5b1dc00d21fdfea.tar.bz2
libmatchboxwm2-4177fd50ce833b0d777db2edd5b1dc00d21fdfea.zip
2007-11-01 Tomas Frydrych <tf@o-hand.com>
* configure.ac: * src/Makefile.am: * src/core/Makefile.am: * src/managers/maemo/Makefile.am: * src/managers/simple/Makefile.am: * src/comp-mgr/mb-wm-comp-mgr.c: * src/comp-mgr/mb-wm-comp-mgr.h: * src/core/mb-wm-types.h: * src/core/mb-wm-client.c: * src/core/mb-wm-client.h: * src/core/mb-wm-main-context.c: * src/core/mb-wm-object-props.h: * src/core/mb-window-manager.c: * src/core/mb-window-manager.h: * src/core/mb-wm-atoms.c: * src/core/mb-wm-client-base.c: Added composite manager. * src/theme-engines/mb-wm-theme-cairo.c: * src/theme-engines/mb-wm-theme-simple.c: * 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: * data/themes/Default/theme.xml: Added clr-shadow and clr-lowlight properties to theme. * src/core/mb-wm-client-window.c: * src/core/mb-wm-client-window.h: Handling of initial _NET_WM_STATE property. * src/core/mb-wm-root-window.c: Handling of _MB_COMMAND ClientMessage.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac25
1 files changed, 22 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 7ce3ee5..a641ef6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,6 +32,10 @@ AC_ARG_ENABLE(debug,
[ --enable-debug Enable verbose debugging output],
[want_debug=$enableval], [want_debug=no])
+AC_ARG_ENABLE(compositing-manager,
+ [ --enable-compositing-manager Enable compositing manager],
+ [comp_mgr=$enableval], [comp_mgr=no])
+
if test "x$use_cairo" = "xyes"; then
needed_pkgs="$needed_pkgs pangocairo "
else
@@ -42,6 +46,10 @@ 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
+
if test "x$want_debug" = "xyes"; then
MBWM_DEBUG_CFLAGS="-O0 $MBWM_DEBUG_CFLAGS -DMBWM_WANT_DEBUG"
MBWM_DEBUG_LDFLAGS="$MBWM_DEBUG_LDFLAGS -rdynamic"
@@ -68,6 +76,11 @@ 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
+ AC_DEFINE(ENABLE_COMPOSITE, 1, [Enable composite manager code])
+fi
+
AC_ARG_ENABLE(simple-manager,
[ --disable-simple-manager Do not build simple window manager],
[simple_manager=$enableval], [simple_manager=yes])
@@ -98,10 +111,11 @@ if test x$have_xcursor = xyes; then
AC_DEFINE(HAVE_XCURSOR, [1], [Use XCursor to sync pointer themes])
fi
-MBWM_INCS='-I$(top_srcdir)/src/core -I$(top_srcdir)/src/client-types -I$(top_srcdir)/src/theme-engines'
+MBWM_INCS='-I$(top_srcdir)/src/core -I$(top_srcdir)/src/client-types -I$(top_srcdir)/src/theme-engines -I$(top_srcdir)/src/comp-mgr'
MBWM_CORE_LIB='$(top_builddir)/src/core/libmatchbox-window-manager-2-core.a'
MBWM_CLIENT_LIBS='$(top_builddir)/src/client-types'
MBWM_THEME_LIBS='$(top_builddir)/src/theme-engines'
+MBWM_COMPMGR_LIBS='$(top_builddir)/src/comp-mgr'
MBWM_CFLAGS="$MBWM_CFLAGS $MBWM_DEBUG_CFLAGS $THEME_PNG_CFLAGS $XFIXES_CFLAGS $XCURSOR_CFLAGS"
MBWM_LIBS="$MBWM_LIBS $THEME_PNG_LIBS $XFIXES_LIBS $XCURSOR_LIBS"
@@ -111,6 +125,7 @@ AC_SUBST([MBWM_CORE_LIB])
AC_SUBST([MBWM_INCS])
AC_SUBST([MBWM_CLIENT_LIBS])
AC_SUBST([MBWM_THEME_LIBS])
+AC_SUBST([MBWM_COMPMGR_LIBS])
AC_SUBST([MBWM_DEBUG_CFLAGS])
AC_SUBST([MBWM_DEBUG_LDFLAGS])
@@ -119,6 +134,7 @@ Makefile
src/Makefile
src/core/Makefile
src/client-types/Makefile
+src/comp-mgr/Makefile
src/managers/Makefile
src/managers/simple/Makefile
src/managers/maemo/Makefile
@@ -146,7 +162,10 @@ echo "
GTK integration : ${use_gtk}
Managers:
- Simple manager : ${simple_manager}
- Maemo manager : ${maemo_manager}
+ Simple manager : ${simple_manager}
+ Maemo manager : ${maemo_manager}
+
+ Compositing manager : ${comp_mgr}
+
Debugging output : ${want_debug}
"