From 925c69cd849d28b286bdab4d95e50756b7ee9dd5 Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Fri, 1 Aug 2014 17:11:04 -0400
Subject: [PATCH] daemon: fix build for --without-dbus
Refs:# 48032
---
daemon/Makefile.am | 6 +++++-
daemon/configure.ac | 4 +++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 61ce4a43bd..9059a99886 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -19,7 +19,11 @@ unittest:
endif
ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = src ringtones man $(TESTS_DIR) doc bin
+SUBDIRS = src ringtones man $(TESTS_DIR) doc
+
+if SFL_DBUS
+SUBDIRS += bin
+endif
EXTRA_DIST = m4/libtool.m4 \
m4/lt~obsolete.m4 \
diff --git a/daemon/configure.ac b/daemon/configure.ac
index 699879dedb..464e5a1202 100644
--- a/daemon/configure.ac
+++ b/daemon/configure.ac
@@ -264,7 +264,9 @@ AS_IF([test "x$with_dbus" = "xyes"], [
AS_IF([test "x$CLANG" = "xyes"], [
AC_MSG_ERROR([dbus does not compile when clang is used, rerun with --without-dbus])
]);
-]);
+
+ AM_CONDITIONAL(SFL_DBUS, true)],
+ AM_CONDITIONAL(SFL_DBUS, false));
dnl Video is default-enabled
--
GitLab