From 4d0eae3e88fbd68c11d03ef694a5c6ad53cc89b3 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Sun, 10 Mar 2019 14:02:20 +0100 Subject: Check for dbustest-1 only with enabled tests. --- configure.ac | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 69cc392..add579e 100644 --- a/configure.ac +++ b/configure.ac @@ -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,, [:]) -- cgit v1.2.3 From 90e4c013386f6d745feb01c12e9c2e494b60d239 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Sun, 10 Mar 2019 14:06:32 +0100 Subject: AM_INIT_AUTOMAKE: subdir-projects flag not required. Fixes FTBFS on recent Archlinux. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index add579e..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 -- cgit v1.2.3