From 152a29c7d25ff84ab363ccb2b176b565930b1a7d Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Thu, 30 Jul 2009 14:15:54 +0100
Subject: [PATCH] Require stable versions of clutter and clutter-gtk

The previous code made assumptions that the clutter and clutter-gtk
API versions would be the same, that's not true.
---
 configure.in |   20 ++++----------------
 1 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/configure.in b/configure.in
index 04888be..ab87d19 100644
--- a/configure.in
+++ b/configure.in
@@ -642,28 +642,16 @@ AM_CONDITIONAL([HAVE_RSVG],[test "$have_rsvg" = "yes"])
 # Check for Clutter
 
 if test "$need_clutter" = "yes"; then
-  CLUTTER_API_VERSION=
-  AC_MSG_CHECKING([for clutter 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
-    AC_MSG_ERROR([no clutter found])
-  fi
-  AC_MSG_RESULT([$CLUTTER_API_VERSION])
-  AC_SUBST([CLUTTER_API_VERSION])
-
-  CLUTTER_REQUIRED=0.9.6
-  CLUTTER_GTK_REQUIRED=0.9.2
+  CLUTTER_REQUIRED=1.0.0
+  CLUTTER_GTK_REQUIRED=0.10.2
 
   PKG_CHECK_MODULES([CLUTTER],[
-    clutter-$CLUTTER_API_VERSION >= $CLUTTER_REQUIRED])
+    clutter-1.0 >= $CLUTTER_REQUIRED])
   AC_SUBST([CLUTTER_CFLAGS])
   AC_SUBST([CLUTTER_LIBS])
 
   PKG_CHECK_MODULES([CLUTTER_GTK],[
-    clutter-gtk-$CLUTTER_API_VERSION  >= $CLUTTER_GTK_REQUIRED])
+    clutter-gtk-0.10  >= $CLUTTER_GTK_REQUIRED])
   AC_SUBST([CLUTTER_GTK_CFLAGS])
   AC_SUBST([CLUTTER_GTK_LIBS])
 fi
-- 
1.6.2.5