[gnome-control-center] shell: Only link to clutter-gtk with cheese support

[Bastien Nocera <hadess src gnome org>]

commit e7d6514a11605dd115ae35cec59a99526e310715
Author: Bastien Nocera <hadess hadess net>
Date:   Sat Aug 18 16:09:24 2012 +0100

    shell: Only link to clutter-gtk with cheese support

 configure.ac                 |    5 ++---
 shell/Makefile.am            |    6 ++++--
 shell/gnome-control-center.c |    4 ++++
 3 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 517718e..0503d57 100644
--- a/configure.ac
+++ b/configure.ac
@@ -120,8 +120,7 @@ COMMON_MODULES="gtk+-3.0 >= $GTK_REQUIRED_VERSION
 PKG_CHECK_MODULES(LIBGNOME_CONTROL_CENTER, $COMMON_MODULES)
 PKG_CHECK_MODULES(LIBLANGUAGE, $COMMON_MODULES gnome-desktop-3.0 fontconfig)
 PKG_CHECK_MODULES(LIBSHORTCUTS, $COMMON_MODULES x11)
-PKG_CHECK_MODULES(SHELL, $COMMON_MODULES libgnome-menu-3.0 gio-unix-2.0 x11 clutter-gtk-1.0 
-                  clutter-1.0 >= $CLUTTER_REQUIRED_VERSION)
+PKG_CHECK_MODULES(SHELL, $COMMON_MODULES libgnome-menu-3.0 gio-unix-2.0 x11)
 PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES libxml-2.0 gnome-desktop-3.0
                   gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION)
 PKG_CHECK_MODULES(DATETIME_PANEL, $COMMON_MODULES
@@ -218,7 +217,7 @@ AC_ARG_WITH([cheese],
             with_cheese=auto)
 
 if test x"$with_cheese" != x"no" ; then
-   PKG_CHECK_MODULES(CHEESE, gstreamer-0.10 cheese-gtk >= 3.3.5 cheese, [have_cheese=yes], [have_cheese=no])
+   PKG_CHECK_MODULES(CHEESE, gstreamer-0.10 cheese-gtk >= 3.3.5 cheese clutter-gtk-1.0, [have_cheese=yes], [have_cheese=no])
    if test x${have_cheese} = xyes; then
      AC_DEFINE(HAVE_CHEESE, 1, [Define to 1 to enable cheese webcam support])
    fi
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 7242475..44e50a6 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -1,6 +1,7 @@
 INCLUDES =					\
 	-I$(top_srcdir)				\
-	$(SHELL_CFLAGS)
+	$(SHELL_CFLAGS)				\
+	$(CHEESE_CFLAGS)
 
 bin_PROGRAMS = gnome-control-center
 
@@ -34,7 +35,8 @@ gnome_control_center_SOURCES =			\
 	$(MARSHAL_FILES)
 
 gnome_control_center_LDADD =			\
-	$(SHELL_LIBS)
+	$(SHELL_LIBS)				\
+	$(CHEESE_LIBS)
 
 gnome_control_center_LDFLAGS = -export-dynamic
 
diff --git a/shell/gnome-control-center.c b/shell/gnome-control-center.c
index 5973219..b04a069 100644
--- a/shell/gnome-control-center.c
+++ b/shell/gnome-control-center.c
@@ -28,7 +28,9 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <string.h>
+#ifdef HAVE_CHEESE
 #include <clutter-gtk/clutter-gtk.h>
+#endif /* HAVE_CHEESE */
 #define GMENU_I_KNOW_THIS_IS_UNSTABLE
 #include <gmenu-tree.h>
 
@@ -1314,11 +1316,13 @@ gnome_control_center_init (GnomeControlCenter *self)
 
   priv = self->priv = CONTROL_CENTER_PRIVATE (self);
 
+#ifdef HAVE_CHEESE
   if (gtk_clutter_init (NULL, NULL) != CLUTTER_INIT_SUCCESS)
     {
       g_critical ("Clutter-GTK init failed");
       return;
     }
+#endif /* HAVE_CHEESE */
 
   priv->monitor_num = -1;
   self->priv->small_screen = SMALL_SCREEN_UNSET;