From 452605811f41f580edae53e80c3a6881b0bd5996 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Tue, 22 Jan 2013 14:30:05 -0600
Subject: add glib requirement to debian/control. bump glib requirement in
 configure.ac

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 6dad74c..bcd7b20 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,7 +41,7 @@ AC_PROG_CXX
 GTK_REQUIRED_VERSION=3.5.18
 GIO_UNIX_REQUIRED_VERSION=2.33.10
 INDICATOR_REQUIRED_VERSION=0.3.19
-GLIB_REQUIRED_VERSION=2.33.10
+GLIB_REQUIRED_VERSION=2.35.4
 INTROSPECTION_REQUIRED_VERSION=1.32.0
 
 PKG_CHECK_MODULES(APPLET, gtk+-3.0 >= $GTK_REQUIRED_VERSION
-- 
cgit v1.2.3


From 5c47f6dbe75e413d2acbcef3e9750e937fb18431 Mon Sep 17 00:00:00 2001
From: Lars Uebernickel <lars.uebernickel@canonical.com>
Date: Mon, 25 Feb 2013 19:34:56 -0500
Subject: Test libmessaging-menu

Use dbusmock to test whether libmessaging-menu calls the right functions on
registration and deregistration.
---
 configure.ac | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index bcd7b20..08ac680 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,7 +75,7 @@ AC_SUBST(COVERAGE_CXXFLAGS)
 AC_SUBST(COVERAGE_LDFLAGS)
 
 ###########################
-# Google Test framework
+# Tests
 ###########################
 
 AC_ARG_ENABLE([tests],
@@ -85,10 +85,16 @@ AC_ARG_ENABLE([tests],
 if test "x$enable_tests" != "xno"; then
     m4_include([m4/gtest.m4])
     CHECK_GTEST
-    if test "x$enable_tests" = "xauto"; then
-        enable_tests=${have_gtest}
-    elif test "x$enable_tests" = "xyes" && test "x$have_gtest" != "xyes"; then
-        AC_MSG_ERROR([tests were requested but gtest is not installed.])
+    AM_PATH_PYTHON(3.0,, [:])
+    AC_PYTHON_MODULE(dbusmock)
+    if test "x$have_gtest" = "xyes" -a "x$HAVE_PYMOD_DBUSMOCK" = "xyes"; then
+        enable_tests="yes"
+    else
+        if test "x$enable_tests" = "xyes"; then
+            AC_MSG_ERROR([tests were requested but gtest or dbusmock are not installed.])
+        else
+            enable_tests="no"
+        fi
     fi
 fi
 AM_CONDITIONAL([BUILD_TESTS],[test "x$enable_tests" = "xyes"])
@@ -193,7 +199,7 @@ Messaging Indicator Configuration:
 
 	Prefix:        $prefix
 	Indicator Dir: $INDICATORDIR
-	gtest:         $enable_tests
+	tests:         $enable_tests
 	gcov:          $use_gcov
 	introspecion:  $enable_introspection
 	documentation: $enable_gtk_doc
-- 
cgit v1.2.3