aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-03-10 14:14:02 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-03-10 14:14:02 +0100
commitd5f1af4e2f1a623046196dda91743fe530494a98 (patch)
tree332417b6489f8ef6a051cc8b07e109d172af3baf
parent564690e1525fb1576bb8745ddef5b90d313adc55 (diff)
parent90e4c013386f6d745feb01c12e9c2e494b60d239 (diff)
downloadayatana-indicator-messages-d5f1af4e2f1a623046196dda91743fe530494a98.tar.gz
ayatana-indicator-messages-d5f1af4e2f1a623046196dda91743fe530494a98.tar.bz2
ayatana-indicator-messages-d5f1af4e2f1a623046196dda91743fe530494a98.zip
Merge branch 'sunweaver-pr/disable-testing'
Attributes GH PR #6: https://github.com/AyatanaIndicators/ayatana-indicator-messages/pull/6 Fixes AyatanaIndicators/ayatana-indicator-messages#4.
-rw-r--r--configure.ac5
1 files changed, 2 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 69cc392..3de3f3a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_INIT(ayatana-indicator-messages, 0.6.0)
AC_PREREQ(2.62)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(subdir-objects)
+AM_INIT_AUTOMAKE()
AM_MAINTAINER_MODE
@@ -47,8 +47,6 @@ PKG_CHECK_MODULES(APPLET, gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
PKG_CHECK_MODULES(GIO, gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION)
-PKG_CHECK_MODULES(DBUSTEST, dbustest-1)
-
AC_SUBST(APPLET_CFLAGS)
AC_SUBST(APPLET_LIBS)
@@ -86,6 +84,7 @@ AC_ARG_ENABLE([tests],
[enable_tests=${enableval}],
[enable_tests=auto])
if test "x$enable_tests" != "xno"; then
+ PKG_CHECK_MODULES(DBUSTEST, dbustest-1)
m4_include([m4/gtest.m4])
CHECK_GTEST
AM_PATH_PYTHON(3.0,, [:])