From 1b09f548c7f303b486b5b1321c06336bff72ada4 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Wed, 17 Jun 2015 16:37:55 +0200 Subject: turn kdbus support into a runtime option ./configure --enable/disable-kdbus can be used to set the default behavior regarding kdbus. If no kdbus kernel support is available, dbus-dameon will be used. With --enable-kdbus, the kernel command line option "kdbus=0" can be used to disable kdbus. With --disable-kdbus, the kernel command line option "kdbus=1" is required to enable kdbus support. --- src/bus-proxyd/bus-proxyd.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/bus-proxyd/bus-proxyd.c') diff --git a/src/bus-proxyd/bus-proxyd.c b/src/bus-proxyd/bus-proxyd.c index 3e398b53e9..3cc3b33ae7 100644 --- a/src/bus-proxyd/bus-proxyd.c +++ b/src/bus-proxyd/bus-proxyd.c @@ -239,11 +239,7 @@ static int parse_argv(int argc, char *argv[]) { if (!e) return log_oom(); -#ifdef ENABLE_KDBUS a = strjoin("x-machine-kernel:machine=", e, ";x-machine-unix:machine=", e, NULL); -#else - a = strjoin("x-machine-unix:machine=", e, NULL); -#endif if (!a) return log_oom(); -- cgit v1.2.3-54-g00ecf