Remove action from release.py script

[empathy.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index cda697702f650056e411d189d9c9242cf6bd388f..6b4735cc239e68a720092b37ec2539a71720ee1b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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
 # -----------------------------------------------------------
@@ -89,14 +92,6 @@ PKG_CHECK_MODULES(EMPATHY,
    libebook-1.2
 ])
 
-# -----------------------------------------------------------
-# SVN for ChangeLog generation
-# -----------------------------------------------------------
-
-AC_SUBST([SVN_ROOT],[http://svn.gnome.org/svn])
-AC_SUBST([SVN_MODULE],[empathy])
-AC_SUBST([SVN_BRANCH],["trunk"])
-
 # -----------------------------------------------------------
 # Language Support
 # -----------------------------------------------------------
@@ -218,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