From a171957a7456d2d827e0db9ee89539a7c0ad9ab8 Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Fri, 12 Jul 2013 17:55:50 -0400
Subject: [PATCH] * #26839: daemon: ensure that HAVE_DBUS is defined

---
 daemon/configure.ac             | 3 +--
 daemon/src/sip/siptransport.cpp | 4 ++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/daemon/configure.ac b/daemon/configure.ac
index d78f9b1ba7..eb32f13813 100644
--- a/daemon/configure.ac
+++ b/daemon/configure.ac
@@ -190,10 +190,9 @@ dnl DBus-C++ detection
 dnl pkg-config doesn't like 0.6.0-pre1 version number, it assumes that it is
 dnl more recent than (unreleased) 0.6.0
 DBUS_CPP_REQUIRED_VERSION=0.6.0-pre1
-PKG_CHECK_MODULES(DBUSCPP, dbus-c++-1,,
+PKG_CHECK_MODULES(DBUSCPP, dbus-c++-1, AC_DEFINE_UNQUOTED(HAVE_DBUS, 1, [D-Bus support enabled]),
 AC_MSG_ERROR([You need the DBus-c++ libraries (version $DBUS_CPP_REQUIRED_VERSION or better)]))
 
-
 # Instant Messaging
 # required dependency(ies): libxpat
 AC_ARG_WITH([instant_messaging],
diff --git a/daemon/src/sip/siptransport.cpp b/daemon/src/sip/siptransport.cpp
index 8ea95e2ffc..144190cb2a 100644
--- a/daemon/src/sip/siptransport.cpp
+++ b/daemon/src/sip/siptransport.cpp
@@ -29,6 +29,10 @@
  *  as that of the covered work.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <map>
 
 #include <pjsip.h>
-- 
GitLab