summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorINSUN PYO <insun.pyo@samsung.com>2017-03-11 23:56:27 +0900
committerHyotaek Shim <hyotaek.shim@samsung.com>2017-04-17 23:33:56 -0700
commit6261016ca921ad80a882fb09114381dc0b9cc963 (patch)
tree1696ebe41c210c28cc4df2a44028deb874eb2dcd
parent2864ee659abac7a28f377247c0024e3cb2418d4c (diff)
downloaddbus-6261016ca921ad80a882fb09114381dc0b9cc963.tar.gz
dbus-6261016ca921ad80a882fb09114381dc0b9cc963.tar.bz2
dbus-6261016ca921ad80a882fb09114381dc0b9cc963.zip
Signed-off-by: INSUN PYO <insun.pyo@samsung.com> Change-Id: I1192579e02963b0246bb99d54f415cab673abbe6
-rw-r--r--configure.ac17
1 files changed, 4 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac
index 9f16e1eb..e0844acb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1634,20 +1634,11 @@ AC_DEFINE_UNQUOTED(DBUS_SYSTEM_SOCKET,"$DBUS_SYSTEM_SOCKET",[The name of the soc
## and also to connect to. If this ever changes, it'll need to be split into
## two variables, one for the listening address and one for the connecting
## address.
-#AC_SUBST(DBUS_SYSTEM_BUS_DEFAULT_ADDRESS)
-if ! test -z "$with_system_default_bus"; then
- ## Now system bus can work on kdbus too. It is diffrent situation than
- ## described above (daemon working with kdbus doesn't need to listen on
- ## any socket), so variable was not splited into two.
- DBUS_SYSTEM_BUS_DEFAULT_ADDRESS=$with_system_default_bus
-else
- kdbus_address_path=""
- if test x$enable_kdbus_transport = xyes; then
- kdbus_address_path="kernel:path=/sys/fs/kdbus/0-system/bus;"
- fi
-
- DBUS_SYSTEM_BUS_DEFAULT_ADDRESS="${kdbus_address_path}unix:path=$DBUS_SYSTEM_SOCKET"
+kdbus_address_path=""
+if test x$enable_kdbus_transport = xyes; then
+ kdbus_address_path="kernel:path=/sys/fs/kdbus/0-system/bus;"
fi
+DBUS_SYSTEM_BUS_DEFAULT_ADDRESS="${kdbus_address_path}unix:path=$DBUS_SYSTEM_SOCKET"
AC_SUBST(DBUS_SYSTEM_BUS_DEFAULT_ADDRESS)
AC_DEFINE_UNQUOTED(DBUS_SYSTEM_BUS_DEFAULT_ADDRESS, "$DBUS_SYSTEM_BUS_DEFAULT_ADDRESS",[The default D-Bus address of the system bus])