diff options
| author | Kay Sievers <kay@vrfy.org> | 2013-11-06 02:03:05 +0100 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2013-11-06 02:03:05 +0100 |
| commit | 2270309471213a3c960543e523130627e9cb10e2 (patch) | |
| tree | 78ca05a88aebf62fb2f91a0e3b5a5d493e8c392d | |
| parent | 95b015de3849d8d8d03d9441ae1682a04c38833b (diff) | |
bus: test-bus-marshal - make dbus-1 optional
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/libsystemd-bus/test-bus-marshal.c | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 7e41d577b..bb0840777 100644 --- a/configure.ac +++ b/configure.ac @@ -236,8 +236,10 @@ AC_CHECK_DECLS([gettid, pivot_root, name_to_handle_at], [], [], [[#include <sys/ # This makes sure pkg.m4 is available. m4_pattern_forbid([^_?PKG_[A-Z_]+$],[*** pkg.m4 missing, please install pkg-config]) -PKG_CHECK_MODULES(DBUS, [dbus-1 >= 1.3.2]) - +# ------------------------------------------------------------------------------ +PKG_CHECK_MODULES(DBUS, [dbus-1 >= 1.3.2], have_dbus=yes, have_dbus=no]) +AS_IF([test "$have_dbus" = "yes"], [ AC_DEFINE(HAVE_DBUS, [1], [Define if dbus-1 is available]) ]) +AM_CONDITIONAL(HAVE_DBUS, [test "$have_dbus" = "yes"]) # ------------------------------------------------------------------------------ have_coverage=no diff --git a/src/libsystemd-bus/test-bus-marshal.c b/src/libsystemd-bus/test-bus-marshal.c index 2a27e623f..ae61476d5 100644 --- a/src/libsystemd-bus/test-bus-marshal.c +++ b/src/libsystemd-bus/test-bus-marshal.c @@ -27,7 +27,9 @@ #include <gio/gio.h> #endif +#ifdef HAVE_DBUS #include <dbus.h> +#endif #include "log.h" #include "util.h" @@ -126,6 +128,7 @@ int main(int argc, char *argv[]) { } #endif +#ifdef HAVE_DBUS { DBusMessage *w; DBusError error; @@ -138,6 +141,7 @@ int main(int argc, char *argv[]) { } else dbus_message_unref(w); } +#endif m = sd_bus_message_unref(m); |