diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-09-29 01:43:52 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2003-09-29 01:43:52 +0000 |
| commit | b99e916792a37e3ed85d15c615eddd2a097e4eff (patch) | |
| tree | 9c272790132a6197633575c52716a6777afaff52 /configure.in | |
| parent | 562ad0a174e42749c5cedb65fd1a0a30aec2a6e5 (diff) | |
2003-09-28 Havoc Pennington <hp@pobox.com>
* configure.in: 0.13
* doc/Makefile.am (dbus-test-plan.html): accept nonexistence of
stylesheet-images for benefit of Debian
Change back to using filesystem-linked sockets for the system
bus, so only root can create the default system bus address.
* bus/system.conf.in: change to use
DBUS_SYSTEM_BUS_DEFAULT_ADDRESS
* dbus/Makefile.am (INCLUDES): remove DBUS_SYSTEM_BUS_PATH define
from here.
* configure.in: define DBUS_SYSTEM_BUS_DEFAULT_ADDRESS
here, and AC_DEFINE DBUS_SYSTEM_PATH
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 0923273f..0a5928a2 100644 --- a/configure.in +++ b/configure.in @@ -3,7 +3,7 @@ AC_PREREQ(2.52) AC_INIT(dbus/dbus.h) -AM_INIT_AUTOMAKE(dbus, 0.12) +AM_INIT_AUTOMAKE(dbus, 0.13) AM_CONFIG_HEADER(config.h) @@ -750,6 +750,13 @@ else 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) +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]) #### Set up the pid file if ! test -z "$with_system_pid_file"; then @@ -894,6 +901,7 @@ echo " Init scripts style: ${with_init_scripts} Abstract socket names: ${have_abstract_sockets} System bus socket: ${DBUS_SYSTEM_SOCKET} + System bus address: ${DBUS_SYSTEM_BUS_DEFAULT_ADDRESS} System bus PID file: ${DBUS_SYSTEM_PID_FILE} Session bus socket dir: ${DBUS_SESSION_SOCKET_DIR} 'make check' socket dir: ${TEST_SOCKET_DIR} |