--- configure.ac.orig	2010-09-20 21:51:50.289828895 +0200
+++ configure.ac	2010-09-20 22:01:21.623107607 +0200
@@ -76,8 +76,17 @@
 JSON_GLIB_REQUIRED_VERSION=0.6.0
 GIO_UNIX_REQUIRED_VERSION=2.24
 
+AC_ARG_ENABLE([tests],
+	AC_HELP_STRING([--disable-tests], [Disable tests]),
+	[enable_tests=$enableval], [enable_tests=auto])
+AM_CONDITIONAL([WANT_TESTS], [test "x$enable_tests" != "xno"])
+
+AS_IF([test "x$enable_tests" != "xno"],[
 PKG_CHECK_MODULES(DBUSMENUTESTS,  json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
-                                  gio-unix-2.0  >= $GIO_UNIX_REQUIRED_VERSION)
+                                  gio-unix-2.0  >= $GIO_UNIX_REQUIRED_VERSION,
+                                  [have_tests=yes]
+)
+])
 
 AC_SUBST(DBUSMENUTESTS_CFLAGS)
 AC_SUBST(DBUSMENUTESTS_LIBS)
@@ -193,1 +193,6 @@
 
+AS_IF([test "x$have_tests" = "xyes"],
+	AC_MSG_NOTICE([	Tests:                  yes]),
+	AC_MSG_NOTICE([	Tests:                  no])
+)
+
--- Makefile.am.orig	2010-09-20 21:58:41.616751481 +0200
+++ Makefile.am	2010-09-20 22:01:55.525674385 +0200
@@ -5,2 +5,6 @@
 
+if WANT_TESTS
+TESTS_SUBDIR = tests
+endif
+
 SUBDIRS = \
@@ -9,3 +9,3 @@
 	tools \
-	tests \
+	$(TESTS_SUBDIR) \
 	docs \
--- tools/testapp/Makefile.am.orig    2011-01-29 13:42:00.984605528 +0100
+++ tools/testapp/Makefile.am 2011-01-29 13:44:45.523514281 +0100
@@ -1,5 +1,9 @@
 
-libexec_PROGRAMS = dbusmenu-testapp
+libexec_PROGRAMS =
+
+if WANT_TESTS
+libexec_PROGRAMS += dbusmenu-testapp
+endif
 
 dbusmenu_testapp_SOURCES = \
    main.c