From 626851be97b4332fc0401d754c81ae7bbc0f5dc4 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sat, 30 Nov 2013 20:18:48 +0100 Subject: bus: do kdbus only if this is enabled on the configure switch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since we want to retain the ability to break kernel ←→ userspace ABI after the next release, let's not make use by default of kdbus, so that people with future kernels will not suddenly break with current systemd versions. kdbus support is left in all builds but must now be explicitly requested at runtime (for example via setting $DBUS_SESSION_BUS). Via a configure switch the old behaviour can be restored. In fact, we change autogen.sh to do this, so that git builds (which run autogen.sh) get kdbus by default, but tarball builds (which ue the configure defaults) do not get it, and hence this stays out of the distros by default. --- autogen.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'autogen.sh') diff --git a/autogen.sh b/autogen.sh index 9869c156ae..d0a2f3fee2 100755 --- a/autogen.sh +++ b/autogen.sh @@ -54,10 +54,10 @@ args="$args \ fi if [ "x$1" = "xc" ]; then - ./configure CFLAGS='-g -O0' $args + ./configure CFLAGS='-g -O0' --enable-kdbus $args make clean elif [ "x$1" = "xg" ]; then - ./configure CFLAGS='-g -Og' $args + ./configure CFLAGS='-g -Og' --enable-kdbus $args make clean else echo @@ -65,6 +65,6 @@ else echo "Initialized build system. For a common configuration please run:" echo "----------------------------------------------------------------" echo - echo "./configure CFLAGS='-g -O0' $args" + echo "./configure CFLAGS='-g -O0' --enable-kdbus $args" echo fi -- cgit v1.2.3-54-g00ecf