gnome-games r8174 - trunk

[chpe svn gnome org]

Author: chpe
Date: Tue Oct 21 21:50:06 2008
New Revision: 8174
URL: http://svn.gnome.org/viewvc/gnome-games?rev=8174&view=rev

Log:
Simplify clutter check.
Call AM_CONDITIONALLY unconditionally.

Modified:
   trunk/configure.in

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Oct 21 21:50:06 2008
@@ -441,30 +441,28 @@
 
 AM_CONDITIONAL([HAVE_RSVG],[test "$have_rsvg" = "yes"])
 
-# Check for libclutter
+# Check for Clutter
 
 have_clutter=no
 if test "$need_clutter" = "yes"; then
   PKG_CHECK_MODULES([CLUTTER],[
-    clutter-0.8
-    clutter-gtk-0.8
-    clutter-cairo-0.8],
+     clutter-0.8
+     clutter-gtk-0.8
+     clutter-cairo-0.8],
     [have_clutter=yes],[have_clutter=no])
-fi
 
-if test "$need_clutter" = "yes" -a "$have_clutter" = "no"; then
-  AC_MSG_ERROR([Clutter and Clutter-GTK are required for some games but are missing])
-fi
+  if test "$have_clutter" = "no"; then
+    AC_MSG_ERROR([Clutter and Clutter-GTK are required for some games but are missing])
+  fi
 
-if test "$have_clutter" = "yes"; then
-  AC_SUBST(CLUTTER_CFLAGS)
-  AC_SUBST(CLUTTER_LIBS)
-  AC_SUBST(CLUTTER_GTK_CFLAGS)
-  AC_SUBST(CLUTTER_GTK_LIBS)
-  
-  AM_CONDITIONAL([HAVE_CLUTTER],[test "$have_clutter" = "yes"])
+  AC_SUBST([CLUTTER_CFLAGS])
+  AC_SUBST([CLUTTER_LIBS])
+  AC_SUBST([CLUTTER_GTK_CFLAGS])
+  AC_SUBST([CLUTTER_GTK_LIBS])
 fi
 
+AM_CONDITIONAL([HAVE_CLUTTER],[test "$have_clutter" = "yes"])
+
 # Check for PyGTK
 
 if test "$have_python" = "yes"; then