[build] Depend on Clutter 1.0.0

We require the new stable version of Clutter, now that we have it.

diff --git a/README b/README
index 6c3a12c..14afc89 100644 (file)
--- a/README
+++ b/README
@@ -7,7 +7,7 @@ default ClutterStage into any GtkContainer.
 
 Requirements:
 
 
 Requirements:
 

-  Clutter >= 0.9.0 (X11 backend) or >= 0.9.0 (Win32 backend)
+  Clutter >= 1.0.0 (X11 backend) or >= 1.0.0 (Win32 backend)

   GTK+ >= 2.12
 
 Copyright (C) 2006, 2007, 2008  OpenedHand Ltd
   GTK+ >= 2.12
 
 Copyright (C) 2006, 2007, 2008  OpenedHand Ltd

diff --git a/clutter-gtk/Makefile.am b/clutter-gtk/Makefile.am
index d0a0250..aa7d155 100644 (file)
--- a/clutter-gtk/Makefile.am
+++ b/clutter-gtk/Makefile.am
@@ -31,7 +31,7 @@ libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_SOURCES = \
 libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_LIBADD = $(CLUTTER_LIBS) $(GTK_LIBS)
 libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_LDFLAGS = $(CLUTTER_LT_LDFLAGS)
 
 libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_LIBADD = $(CLUTTER_LIBS) $(GTK_LIBS)
 libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_LDFLAGS = $(CLUTTER_LT_LDFLAGS)
 

-cluttergtkheadersdir = $(includedir)/clutter-0.9/clutter-gtk
+cluttergtkheadersdir = $(includedir)/clutter-1.0/clutter-gtk

 
 # please, keep the list sorted alphabetically
 cluttergtkheaders_HEADERS = \
 
 # please, keep the list sorted alphabetically
 cluttergtkheaders_HEADERS = \

@@ -50,13 +50,13 @@ GtkClutter-@CLUTTER_GTK_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-gt
                --namespace GtkClutter --nsversion=@CLUTTER_GTK_API_VERSION@ \
                $(INCLUDES) \
                --add-include-path=$(srcdir) --add-include=path=. \
                --namespace GtkClutter --nsversion=@CLUTTER_GTK_API_VERSION@ \
                $(INCLUDES) \
                --add-include-path=$(srcdir) --add-include=path=. \

-               --include=Clutter-0.9 \
+               --include=Clutter-1.0 \

                --include=Gtk-2.0 \
                --library=clutter-gtk-@CLUTTER_GTK_API_VERSION@ \
                --libtool="$(top_builddir)/libtool" \
                --output $@ \
                --pkg gobject-2.0 \
                --include=Gtk-2.0 \
                --library=clutter-gtk-@CLUTTER_GTK_API_VERSION@ \
                --libtool="$(top_builddir)/libtool" \
                --output $@ \
                --pkg gobject-2.0 \

-               --pkg clutter-0.9 \
+               --pkg clutter-1.0 \

                --pkg gtk+-2.0 \
                $(cluttergtkheaders_HEADERS) \
                $(libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_SOURCES)
                --pkg gtk+-2.0 \
                $(cluttergtkheaders_HEADERS) \
                $(libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_SOURCES)

diff --git a/configure.ac b/configure.ac
index 60d67c1..87ac5e7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -54,7 +54,7 @@ AC_PROG_CC
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 

-m4_define([clutter_req_version], [0.9.8])
+m4_define([clutter_req_version], [1.0.0])

 m4_define([gtk_req_version], [2.12.0])
 m4_define([flavour_default], [x11])
 AC_ARG_WITH([flavour],
 m4_define([gtk_req_version], [2.12.0])
 m4_define([flavour_default], [x11])
 AC_ARG_WITH([flavour],

@@ -66,16 +66,16 @@ AC_ARG_WITH([flavour],
 AS_CASE([$with_flavour],
         [x11], [
           AC_DEFINE([HAVE_CLUTTER_GTK_X11], 1, [Using the X11 flavour])
 AS_CASE([$with_flavour],
         [x11], [
           AC_DEFINE([HAVE_CLUTTER_GTK_X11], 1, [Using the X11 flavour])

-          PKG_CHECK_MODULES(CLUTTER, clutter-x11-0.9 >= clutter_req_version)
+          PKG_CHECK_MODULES(CLUTTER, clutter-x11-1.0 >= clutter_req_version)

           PKG_CHECK_MODULES(GTK, gtk+-x11-2.0 >= gtk_req_version)
           PKG_CHECK_MODULES(GTK, gtk+-x11-2.0 >= gtk_req_version)

-          CLUTTER_GTK_REQUIRES="clutter-x11-0.9 gtk+-x11-2.0"
+          CLUTTER_GTK_REQUIRES="clutter-x11-1.0 gtk+-x11-2.0"

         ],
 
         [win32], [
           AC_DEFINE([HAVE_CLUTTER_GTK_WIN32], 1, [Using the Win32 flavour])
         ],
 
         [win32], [
           AC_DEFINE([HAVE_CLUTTER_GTK_WIN32], 1, [Using the Win32 flavour])

-          PKG_CHECK_MODULES(CLUTTER, clutter-win32-0.9 >= $CLUTTER_REQUIRED)
+          PKG_CHECK_MODULES(CLUTTER, clutter-win32-1.0 >= $CLUTTER_REQUIRED)

           PKG_CHECK_MODULES(GTK, gtk+-win32-2.0 >= gtk_req_version)
           PKG_CHECK_MODULES(GTK, gtk+-win32-2.0 >= gtk_req_version)

-          CLUTTER_GTK_REQUIRES="clutter-win32-0.9 gtk+-win32-2.0"
+          CLUTTER_GTK_REQUIRES="clutter-win32-1.0 gtk+-win32-2.0"

         ]
 
         [AC_MSG_ERROR([Invalid argument for --with-flavour])]
         ]
 
         [AC_MSG_ERROR([Invalid argument for --with-flavour])]