X-Git-Url: http://git.maemo.org/git/?p=clutter-gtk;a=blobdiff_plain;f=configure.ac;h=1dfebd38d78e74f64185ce413e8dd22ac319a87f;hp=d20530fdb98c883376443ccc21bb68d32a05dbb2;hb=HEAD;hpb=89bf3ebf4a5bd8a666ff94d81061f1209c5d53d9

diff --git a/configure.ac b/configure.ac
index d20530f..1dfebd3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,8 +2,8 @@
 # An odd micro number indicates in-progress development, (eg. from git)
 # An even micro number indicates a released version.
 m4_define([clutter_gtk_major], [0])
-m4_define([clutter_gtk_minor], [9])
-m4_define([clutter_gtk_micro], [1])
+m4_define([clutter_gtk_minor], [10])
+m4_define([clutter_gtk_micro], [2])
 
 m4_define([clutter_gtk_api_version], [clutter_gtk_major.clutter_gtk_minor])
 m4_define([clutter_gtk_version], [clutter_gtk_major.clutter_gtk_minor.clutter_gtk_micro])
@@ -54,7 +54,7 @@ AC_PROG_CC
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 
-m4_define([clutter_req_version], [0.9.0])
+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],
@@ -66,16 +66,16 @@ AC_ARG_WITH([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)
-          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])
-          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)
-          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])]
@@ -132,7 +132,10 @@ AC_ARG_ENABLE([maintainer-flags],
 MAINTAINER_CFLAGS=""
 AS_IF([test "x$enable_maintainer_flags" = "xyes" && test "x$GCC" = "xyes"],
       [
-        MAINTAINER_CFLAGS="-Werror -Wall -Wshadow -Wcast-align -Wno-uninitialized -Wempty-body -Wformat-security -Winit-self"
+        AS_COMPILER_FLAGS([MAINTAINER_CFLAGS],
+                          ["-Werror -Wall -Wshadow -Wcast-align
+                            -Wno-uninitialized -Wempty-body -Wformat-security
+                            -Winit-self"])
       ]
 )