[gnome-initial-setup] configure: Make Cheese optional again

[Jasper St. Pierre <jstpierre src gnome org>]

commit b08df12dd2992fc5f5c3ad6ee9397e75049eec79
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Thu Nov 8 17:33:48 2012 -0500

    configure: Make Cheese optional again

 configure.ac                                  |   13 +++++++++++--
 gnome-initial-setup/gnome-initial-setup.c     |    4 ++++
 gnome-initial-setup/pages/account/Makefile.am |    2 +-
 3 files changed, 16 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 2746624..8cc41b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,8 +26,6 @@ PKG_CHECK_MODULES(INITIAL_SETUP,
                   accountsservice
                   gnome-desktop-3.0
                   gstreamer-1.0
-                  cheese
-                  cheese-gtk >= 3.3.5
                   fontconfig
                   geoclue
                   gweather-3.0
@@ -37,6 +35,17 @@ PKG_CHECK_MODULES(INITIAL_SETUP,
                   gio-unix-2.0 >= $GLIB_REQUIRED_VERSION
                   gdm)
 
+PKG_CHECK_MODULES(CHEESE,
+                  cheese
+                  cheese-gtk >= 3.3.5,
+                  have_cheese=yes, have_cheese=no)
+AM_CONDITIONAL(HAVE_CHEESE, [test x$have_cheese = xyes])
+if test x$have_cheese = xyes; then
+  INITIAL_SETUP_CFLAGS="$INITIAL_SETUP_CFLAGS $CHEESE_CFLAGS"
+  INITIAL_SETUP_LIBS="$INITIAL_SETUP_LIBS $CHEESE_LIBS"
+  AC_DEFINE(HAVE_CHEESE, 1, [Build with Cheese support?])
+fi
+
 PKG_CHECK_MODULES(CLUTTER,
                   clutter-gtk-1.0
                   clutter-1.0 >= $CLUTTER_REQUIRED_VERSION,
diff --git a/gnome-initial-setup/gnome-initial-setup.c b/gnome-initial-setup/gnome-initial-setup.c
index 0b63ddf..57ee8fd 100644
--- a/gnome-initial-setup/gnome-initial-setup.c
+++ b/gnome-initial-setup/gnome-initial-setup.c
@@ -31,7 +31,9 @@
 #include <clutter-gtk/clutter-gtk.h>
 #endif
 
+#ifdef HAVE_CHEESE
 #include <cheese-gtk.h>
+#endif
 
 #include "pages/language/gis-language-page.h"
 #include "pages/eulas/gis-eula-pages.h"
@@ -65,7 +67,9 @@ main (int argc, char *argv[])
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
   textdomain (GETTEXT_PACKAGE);
 
+#ifdef HAVE_CHEESE
   cheese_gtk_init (NULL, NULL);
+#endif
 
   gtk_init (&argc, &argv);
 
diff --git a/gnome-initial-setup/pages/account/Makefile.am b/gnome-initial-setup/pages/account/Makefile.am
index 61c7890..0d7ff86 100644
--- a/gnome-initial-setup/pages/account/Makefile.am
+++ b/gnome-initial-setup/pages/account/Makefile.am
@@ -30,7 +30,7 @@ libgisaccount_la_SOURCES =				\
 	um-utils.c um-utils.h				\
 	$(NULL)
 
-libgisaccount_la_CFLAGS = $(INITIAL_SETUP_CFLAGS) -I "$(srcdir)/../.." -DHAVE_CHEESE
+libgisaccount_la_CFLAGS = $(INITIAL_SETUP_CFLAGS) -I "$(srcdir)/../.."
 libgisaccount_la_LIBADD = $(INITIAL_SETUP_LIBS) -lcrypt
 libgisaccount_la_LDFLAGS = -export_dynamic -avoid-version -module -no-undefined