diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-08-13 20:13:16 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-08-13 20:13:16 +0100 |
| commit | dddedfa27db3afab96cba443d07ee81594817a01 (patch) | |
| tree | 86aa092b2892d3441e1d0957c45b96f3c7baef5e /configure.ac | |
| parent | 627cdde0ebe00678a71e0bf3f21aedcbd4c7a940 (diff) | |
| download | dbus-dddedfa27db3afab96cba443d07ee81594817a01.tar.gz | |
Revert "cmake: use the same default system bus address as for autotools"
This reverts commit 05b0b9e65b6a58f0b0cb56d6ee8cf100061250b3.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index 12847c4a..e8fc1aef 100644 --- a/configure.ac +++ b/configure.ac @@ -1521,17 +1521,8 @@ fi AC_SUBST(DBUS_SYSTEM_SOCKET) AC_DEFINE_UNQUOTED(DBUS_SYSTEM_SOCKET,"$DBUS_SYSTEM_SOCKET",[The name of the socket the system bus listens on by default]) -## System bus only listens on local domain sockets, and never -## on an abstract socket (so only root can create the socket). -## -## This won't work on Windows. It's not meant to - the system bus is -## meaningless on Windows anyway. -## -## This has to be suitable for hard-coding in client libraries as well as -## in the dbus-daemon's configuration, so it has to be valid to listen on -## 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. +## system bus only listens on local domain sockets, and never +## on an abstract socket (so only root can create the socket) DBUS_SYSTEM_BUS_DEFAULT_ADDRESS="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]) |