[viewport] Remove units-based API

[clutter-gtk] / configure.ac

diff --git a/configure.ac b/configure.ac
index 7b80ef3..fe4de51 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # An odd micro number indicates in-progress development, (eg. from CVS)
 # An even micro number indicates a released version.
 m4_define([clutter_major_version], [0])
-m4_define([clutter_minor_version], [1])
+m4_define([clutter_minor_version], [9])
 m4_define([clutter_micro_version], [0])
 
 m4_define([clutter_version],
@@ -21,10 +21,10 @@ AC_PREREQ(2.53)
 AC_INIT([clutter-gtk],
         [clutter_version],
         [http://bugzilla.o-hand.com/enter_bug.cgi?product=Clutter])
-AC_CONFIG_SRCDIR([clutter-gtk/clutter-gtk.h])
+AC_CONFIG_SRCDIR([clutter-gtk/gtk-clutter-embed.h])
 AM_CONFIG_HEADER([config.h])
 
-AM_INIT_AUTOMAKE([1.7])
+AM_INIT_AUTOMAKE([1.9])
 
 CLUTTER_GTK_MAJOR_VERSION=clutter_major_version
 CLUTTER_GTK_MINOR_VERSION=clutter_minor_version
@@ -67,14 +67,36 @@ AC_FUNC_MALLOC
 AC_FUNC_MMAP
 AC_CHECK_FUNCS([memset munmap strcasecmp strdup])
 
-CLUTTER_REQUIRED=0.2.2
-GTK_REQUIRED=2.10.0
+CLUTTER_REQUIRED=0.9.0
+
+cluttergtkflavour=x11
+AC_ARG_WITH([flavour],
+            AC_HELP_STRING([--with-flavour=@<:@x11/win32@:>@],
+                           [Select the Clutter backend]),
+            cluttergtkflavour=$with_flavour)
+
+case $cluttergtkflavour in
+
+  x11)
+    AC_DEFINE([HAVE_CLUTTER_GTK_X11], 1, [Using the X11 flavour])
+    PKG_CHECK_MODULES(CLUTTER, clutter-x11-0.9 >= $CLUTTER_REQUIRED)
+    ;;
+    
+  win32)
+    AC_DEFINE([HAVE_CLUTTER_GTK_WIN32], 1, [Using the Win32 flavour])
+    PKG_CHECK_MODULES(CLUTTER, clutter-win32-0.9 >= $CLUTTER_REQUIRED)
+    ;;
+    
+  *)
+    AC_MSG_ERROR([Invalid flavour for Clutter-GTK: use x11 or win32])
+    ;;
+
+esac
 
-PKG_CHECK_MODULES(CLUTTER, clutter-0.2 >= $CLUTTER_REQUIRED)
 AC_SUBST(CLUTTER_CFLAGS)
 AC_SUBST(CLUTTER_LIBS)
 
-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED)
+PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.12)
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
 
@@ -110,7 +132,7 @@ AC_SUBST(CLUTTER_DEBUG_CFLAGS)
 
 dnl = GTK Doc check ========================================================
 
-GTK_DOC_CHECK([1.4])
+GTK_DOC_CHECK([1.8])
 
 dnl ========================================================================
 
@@ -136,6 +158,7 @@ echo "                 ==================="
 echo ""
 echo "                   prefix:   ${prefix}"
 echo ""
+echo "                  Flavour:   ${cluttergtkflavour}"
 echo "              Debug level:   ${enable_debug}"
 echo "            Documentation:   ${enable_gtk_doc}"
 echo ""