Bump version to 0.21.6, this time we really got 0.21.5.x right!

[empathy.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index c86b1190f48f9a06bbe45c3582e34fddc04a7450..0855913276cbdbcc2b9f9ee0d31a2a6f65cc883d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(Empathy, 0.21.5, http://bugzilla.gnome.org/browse.cgi?product=empathy)
+AC_INIT(Empathy, 0.21.6, http://bugzilla.gnome.org/browse.cgi?product=empathy)
 AC_PREREQ(2.59)
 AC_COPYRIGHT([
   Copyright (C) 2003-2007 Imendio AB
@@ -9,12 +9,12 @@ AC_COPYRIGHT([
 #   (Interfaces removed:    CURRENT++, AGE=0, REVISION=0)
 #   (Interfaces added:      CURRENT++, AGE++, REVISION=0)
 #   (No interfaces changed:                   REVISION++)
-LIBEMPATHY_CURRENT=8
-LIBEMPATHY_AGE=1
+LIBEMPATHY_CURRENT=9
+LIBEMPATHY_AGE=2
 LIBEMPATHY_REVISION=0
 
-LIBEMPATHY_GTK_CURRENT=8
-LIBEMPATHY_GTK_AGE=1
+LIBEMPATHY_GTK_CURRENT=9
+LIBEMPATHY_GTK_AGE=0
 LIBEMPATHY_GTK_REVISION=0
 
 AC_SUBST(LIBEMPATHY_CURRENT)
@@ -32,13 +32,14 @@ LIBGLADE_REQUIRED=2.0.0
 LIBPANELAPPLET_REQUIRED=2.10.0
 TELEPATHY_REQUIRED=0.3.1
 TELEPATHY_GLIB_REQUIRED=0.7.0
-MISSION_CONTROL_REQUIRED=4.37
+MISSION_CONTROL_REQUIRED=4.53
 
 # Uncomment that to build without deprecated symbols
 # AC_DEFINE(GTK_DISABLE_DEPRECATED, 1, [Disable deprecated GTK symbols])
 # AC_DEFINE(G_DISABLE_DEPRECATED, 1, [Disable deprecated GLib symbols])
 # AC_DEFINE(LIBTELEPATHY_DISABLE_DEPRECATED, 1, [Disable deprecated libtelepathy symbols])
 
+AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR(.)
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(1.9 dist-bzip2 no-define)
@@ -58,6 +59,8 @@ AM_GCONF_SOURCE_2
 GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal`
 AC_SUBST(GLIB_GENMARSHAL)
 
+EMPATHY_ARG_VALGRIND
+
 # -----------------------------------------------------------
 # Pkg-Config dependency checks
 # -----------------------------------------------------------
@@ -210,11 +213,24 @@ AM_CONDITIONAL(HAVE_NOTHERE, test "x$have_nothere" = "xyes")
 # Tests
 # -----------------------------------------------------------
 AC_ARG_ENABLE(tests,
-              AS_HELP_STRING([--enable-tests=@<:@no/yes@:>@],
+              AS_HELP_STRING([--enable-tests=@<:@no/yes/auto@:>@],
                              [build tests]), ,
-                             enable_tests=no)
+                             enable_tests=auto)
+
+if test "x$enable_tests" != "xno"; then
+   PKG_CHECK_MODULES(CHECK,
+   [
+      check >= 0.9.4
+   ], have_check="yes", have_check="no")
+else
+   have_check=no
+fi
+
+if test "x$enable_tests" = "xyes" -a "x$have_check" != "xyes"; then
+   AC_MSG_ERROR([Couldn't find check dependencies.])
+fi
 
-AM_CONDITIONAL(HAVE_TESTS, test "x$enable_tests" = "xyes")
+AM_CONDITIONAL(HAVE_TESTS, test "x$have_check" = "xyes")
 
 # -----------------------------------------------------------
 # Python Bindings