[gnome-control-center/extensible-shell] Add support for mutter as a replacement requirement for metacity

[Thomas Wood <thos src gnome org>]

commit 2d33386995051ad58f9da599f23ec4cf0048e89f
Author: Thomas Wood <thomas wood intel com>
Date:   Thu Feb 11 14:31:08 2010 +0000

    Add support for mutter as a replacement requirement for metacity

 configure.ac                                       |   22 +++++++++++++++++++-
 libgnome-control-center-extension/Makefile.am      |    6 ++--
 .../cc-theme-thumbnailer-slave.c                   |   14 ++++++++++++
 .../theme-thumbnail.c                              |   15 ++++++++++++-
 4 files changed, 52 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 6dfe7b7..818be22 100644
--- a/configure.ac
+++ b/configure.ac
@@ -92,7 +92,6 @@ PKG_CHECK_MODULES(GNOMECC_SHELL, $COMMON_MODULES libgnome-menu unique-1.0)
 PKG_CHECK_MODULES(DBUS, dbus-1 dbus-glib-1)
 PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-2.0)
 PKG_CHECK_MODULES(DEFAULT_APPLICATIONS_CAPPLET, libxml-2.0)
-PKG_CHECK_MODULES(METACITY, libmetacity-private >= 2.23.1)
 PKG_CHECK_MODULES(TYPING, glib-2.0 > 2.11 gconf-2.0 gtk+-2.0)
 PKG_CHECK_MODULES(GSD_DBUS, gnome-settings-daemon)
 PKG_CHECK_MODULES(GIO, gio-2.0)
@@ -228,6 +227,27 @@ fi
 
 AM_CONDITIONAL(BUILD_ABOUTME, test "x$enable_aboutme" = "xyes")
 
+
+dnl ==============================================
+dnl Check the window manager we need to work with
+dnl ==============================================
+
+AC_ARG_WITH([window_manager],
+            [AS_HELP_STRING([--with-window-manager],
+                            [specify which window manager to support (metacity, mutter)])],
+            [with_window_manager=${withval}],
+            [with_window_manager=metacity])
+
+AS_IF([test "x$with_window_manager" == "xmetacity"],
+      [WM_REQUIRES="libmetacity-private >= 2.23.1"
+       AC_DEFINE(HAVE_METACITY, 1, [defined if using metacity])],
+      [test "x$with_window_manager" == "xmutter"],
+      [WM_REQUIRES="libmutter-private >= 2.23.1"
+       AC_DEFINE(HAVE_MUTTER, 1, [defined if using mutter])],
+      [AC_MSG_FAILURE([Unsuported window manager: "$with_window_manager"])])
+
+PKG_CHECK_MODULES(WINDOW_MANAGER, $WM_REQUIRES)
+
 dnl ==============================================
 dnl End: Check that we meet the  dependencies
 dnl ==============================================
diff --git a/libgnome-control-center-extension/Makefile.am b/libgnome-control-center-extension/Makefile.am
index fc6fbc9..19854b2 100644
--- a/libgnome-control-center-extension/Makefile.am
+++ b/libgnome-control-center-extension/Makefile.am
@@ -12,7 +12,7 @@ INCLUDES =						\
 	$(CAPPLET_CFLAGS)						\
 	$(DBUS_CFLAGS)							\
 	$(GNOME_DESKTOP_CFLAGS)						\
-	$(METACITY_CFLAGS)						\
+	$(WINDOW_MANAGER_CFLAGS)						\
 	$(GSD_DBUS_CFLAGS)						\
 	$(GIO_CFLAGS)
 	$(EXTENSION_COMMON_CFLAGS)			\
@@ -55,7 +55,7 @@ cc_theme_thumbnailer_helper_SOURCES =	\
 	$(NULL)
 
 cc_theme_thumbnailer_helper_LDADD = 	\
-	$(METACITY_LIBS)		\
+	$(WINDOW_MANAGER_LIBS)		\
 	$(GNOMECC_CAPPLETS_LIBS)	\
 	$(NULL)
 
@@ -89,7 +89,7 @@ libcommon_la_SOURCES = \
 
 libcommon_la_LIBADD =							\
 	$(top_builddir)/libwindow-settings/libgnome-window-settings.la  \
-	$(METACITY_LIBS)						\
+	$(WINDOW_MANAGER_LIBS)						\
 	$(DBUS_LIBS)							\
 	$(GNOME_DESKTOP_LIBS)						\
 	$(GIO_LIBS)
diff --git a/libgnome-control-center-extension/cc-theme-thumbnailer-slave.c b/libgnome-control-center-extension/cc-theme-thumbnailer-slave.c
index f16acaa..d890538 100644
--- a/libgnome-control-center-extension/cc-theme-thumbnailer-slave.c
+++ b/libgnome-control-center-extension/cc-theme-thumbnailer-slave.c
@@ -28,11 +28,25 @@
 #include <errno.h>
 #include <unistd.h>
 #include <string.h>
+
+
+#ifdef HAVE_MUTTER
+
+#include <mutter-private/util.h>
+#include <mutter-private/theme.h>
+#include <mutter-private/theme-parser.h>
+#include <mutter-private/preview-widget.h>
+
+#else
+
 #include <metacity-private/util.h>
 #include <metacity-private/theme.h>
 #include <metacity-private/theme-parser.h>
 #include <metacity-private/preview-widget.h>
 
+#endif
+
+
 /* We have to #undef this as metacity #defines these. */
 #undef _
 #undef N_
diff --git a/libgnome-control-center-extension/theme-thumbnail.c b/libgnome-control-center-extension/theme-thumbnail.c
index 965de7f..9664fb3 100644
--- a/libgnome-control-center-extension/theme-thumbnail.c
+++ b/libgnome-control-center-extension/theme-thumbnail.c
@@ -1,10 +1,23 @@
-#include <config.h>
+#include "config.h"
 #include <unistd.h>
 #include <string.h>
+
+#ifdef HAVE_MUTTER
+
+#include <mutter-private/util.h>
+#include <mutter-private/theme.h>
+#include <mutter-private/theme-parser.h>
+#include <mutter-private/preview-widget.h>
+
+#else
+
 #include <metacity-private/util.h>
 #include <metacity-private/theme.h>
 #include <metacity-private/theme-parser.h>
 #include <metacity-private/preview-widget.h>
+
+#endif
+
 #include <signal.h>
 #include <errno.h>
 #include <math.h>