From 475c218316fa855e5fcf5bb5d9db0968843f8f93 Mon Sep 17 00:00:00 2001 From: Tristan Matthews <tristan.matthews@savoirfairelinux.com> Date: Wed, 17 Jul 2013 15:23:07 -0400 Subject: [PATCH] * #27352: daemon: dbus is now optional --- daemon/configure-android.sh | 2 +- daemon/configure.ac | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/daemon/configure-android.sh b/daemon/configure-android.sh index 3558f4bc6c..b61a06ba54 100755 --- a/daemon/configure-android.sh +++ b/daemon/configure-android.sh @@ -1 +1 @@ -./configure --without-alsa --without-pulse --without-tls --without-iax2 --without-zrtp --without-sdes --without-speexdsp --without-speex +./configure --without-dbus --without-alsa --without-pulse --without-tls --without-iax2 --without-zrtp --without-sdes --without-speexdsp --without-speex diff --git a/daemon/configure.ac b/daemon/configure.ac index e526ab6393..7a47f7a582 100644 --- a/daemon/configure.ac +++ b/daemon/configure.ac @@ -183,15 +183,18 @@ AS_IF([test "x$with_zrtp" = "xyes"], [ AC_DEFINE_UNQUOTED([HAVE_ZRTP], `if test "x$with_zrtp" = "xyes"; then echo 1; else echo 0; fi`, [Define if you have zrtp support]) AM_CONDITIONAL(BUILD_ZRTP, test "x$with_zrtp" = "xyes" ) +# DBUSCPP +dnl Check for dbuscpp, the C++ bindings for D-Bus +DBUS_CPP_MIN_VERSION=0.0.0-pre1 +AC_ARG_WITH([dbus], + [AS_HELP_STRING([--without-dbus], [disable support for dbus])], + [], + [with_dbus=yes]) +AS_IF([test "x$with_dbus" = "xyes"], [ + PKG_CHECK_MODULES(DBUSCPP, dbus-++-1 >= DBUS_CPP_MIN_VERSION,, AC_MSG_WARN([Missing dbus development package: libdbuscpp-dev])) + ]); -# DBUS -# required dependency(ies): libdbus-c++ -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, 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)])) +AC_DEFINE_UNQUOTED([HAVE_DBUS], `if test "x$with_dbus" = "xyes"; then echo 1; else echo 0; fi`, [Define if you have dbus support]) # Instant Messaging # required dependency(ies): libxpat -- GitLab