[gnome-initial-setup] Fix Clutter optionality

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

commit ef37c5150acea596bd469bea9309e2d601ca012a
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Mon Jul 23 21:21:38 2012 -0300

    Fix Clutter optionality
    
    I don't understand autotools

 configure.ac                    |    5 ++++-
 gnome-initial-setup/Makefile.am |    8 --------
 2 files changed, 4 insertions(+), 9 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index a933102..fcc7550 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,7 +45,10 @@ PKG_CHECK_MODULES(CLUTTER,
                   clutter-1.0 >= $CLUTTER_REQUIRED_VERSION,
                   have_clutter=yes, have_clutter=no)
 AM_CONDITIONAL(HAVE_CLUTTER, [test x$have_clutter = xyes])
-AC_SUBST(HAVE_CLUTTER)
+if test x$have_clutter = xyes; then
+  INITIAL_SETUP_LIBS="$INITIAL_SETUP_LIBS $CLUTTER_LIBS"
+  AC_DEFINE(HAVE_CLUTTER, 1, [Build with Clutter support?])
+fi
 
 AC_CHECK_HEADER([pwquality.h], [have_pwquality=yes], [have_pwquality=no])
 AM_CONDITIONAL(HAVE_PWQUALITY, [test x$have_pwquality = xyes])
diff --git a/gnome-initial-setup/Makefile.am b/gnome-initial-setup/Makefile.am
index 4f8409d..d4b9444 100644
--- a/gnome-initial-setup/Makefile.am
+++ b/gnome-initial-setup/Makefile.am
@@ -11,16 +11,8 @@ AM_CPPFLAGS = \
 	-DUIDIR="\"$(uidir)\"" \
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"
 
-if HAVE_CLUTTER
-AM_CPPFLAGS += $(CLUTTER_CFLAGS)
-endif
-
 LIBS = $(INITIAL_SETUP_LIBS) -lm
 
-if HAVE_CLUTTER
-LIBS += $(CLUTTER_LIBS)
-endif
-
 libexec_PROGRAMS = gnome-initial-setup
 
 BUILT_SOURCES =