gnome-games r8950 - branches/clutter-0-9

[jclinton svn gnome org]

Author: jclinton
Date: Mon Mar 30 01:23:38 2009
New Revision: 8950
URL: http://svn.gnome.org/viewvc/gnome-games?rev=8950&view=rev

Log:
Depend on Clutter 0.9 and make it mandatory if Gnometris or Lights Off is on

Modified:
   branches/clutter-0-9/configure.in

Modified: branches/clutter-0-9/configure.in
==============================================================================
--- branches/clutter-0-9/configure.in	(original)
+++ branches/clutter-0-9/configure.in	Mon Mar 30 01:23:38 2009
@@ -172,7 +172,7 @@
     *) ;;
   esac
   case $game in
-    lightsoff) need_clutter=yes ;;
+    gnometris|lightsoff) need_clutter=yes ;;
     *) ;;
   esac
 done
@@ -325,20 +325,11 @@
 AC_MSG_RESULT([$with_sound])
 
 # Clutter
-  
-AC_MSG_CHECKING([whether to enable clutter support])
-AC_ARG_ENABLE([clutter],
-  [AS_HELP_STRING([--enable-clutter],[whether to enable clutter support (default: disabled)])],
-  [],[case "$with_platform" in
-        gnome|gtk-only) enable_clutter=no ;;
-        hildon) enable_clutter=no ;;
-      esac])
-AC_MSG_RESULT([$enable_clutter])
 
 case "$with_platform" in
   gnome|gtk-only) ;;
-  hildon) if test "$enable_clutter" = "yes"; then
-            AC_MSG_ERROR([Clutter is not supported on hildon])
+  hildon) if test "$need_clutter" = "yes"; then
+            AC_MSG_ERROR([Clutter is not supported on hildon; disable Gnometris and Lights Off])
           fi
           ;;
 esac
@@ -555,15 +546,11 @@
 
 # Check for Clutter
 
-if test "$need_clutter" = "yes" -a "$enable_clutter" != "yes"; then
-  AC_MSG_ERROR([lightsoff requires clutter but --enable-clutter was not passed. Use --omit-games=lightsoff to build without lightsoff])
-fi
-
-if test "$enable_clutter" = "yes"; then
+if test "$need_clutter" = "yes"; then
   CLUTTER_API_VERSION=
   AC_MSG_CHECKING([for clutter API version])
-  for API_VERSION in 0.8; do
-    PKG_CHECK_EXISTS([clutter-$API_VERSION clutter-cairo-$API_VERSION],
+  for API_VERSION in 0.9; do
+    PKG_CHECK_EXISTS([clutter-$API_VERSION clutter-gtk-$API_VERSION],
       [CLUTTER_API_VERSION=$API_VERSION; break],[])
   done
   if test -z "$CLUTTER_API_VERSION"; then
@@ -571,13 +558,11 @@
   fi
   AC_MSG_RESULT([$CLUTTER_API_VERSION])
 
-  CLUTTER_REQUIRED=0.8.8
-  CLUTTER_GTK_REQUIRED=0.8.3
-  CLUTTER_CAIRO_REQUIRED=0.8.2
+  CLUTTER_REQUIRED=0.9.3
+  CLUTTER_GTK_REQUIRED=0.9.0
 
   PKG_CHECK_MODULES([CLUTTER],[
-    clutter-$CLUTTER_API_VERSION >= $CLUTTER_REQUIRED
-    clutter-cairo-$CLUTTER_API_VERSION >= $CLUTTER_CAIRO_REQUIRED])
+    clutter-$CLUTTER_API_VERSION >= $CLUTTER_REQUIRED])
   AC_SUBST([CLUTTER_CFLAGS])
   AC_SUBST([CLUTTER_LIBS])
 
@@ -587,7 +572,7 @@
   AC_SUBST([CLUTTER_GTK_LIBS])
 fi
 
-AM_CONDITIONAL([HAVE_CLUTTER],[test "$enable_clutter" = "yes"])
+AM_CONDITIONAL([HAVE_CLUTTER],[test "$need_clutter" = "yes"])
 
 # Check for DBUS/GLIB
 
@@ -1124,7 +1109,6 @@
 
     Using SM Client:       ${with_smclient}
     Using RSVG:            ${have_rsvg}
-    Using Clutter:         ${enable_clutter}
     Card theme formats:    ${with_card_theme_formats}
     Default theme format:  ${with_default_card_theme_format}
     Default theme:         ${with_default_card_theme}