Commit 87448fed authored by Simon McVittie's avatar Simon McVittie Committed by Ralf Habacker

Make various system-bus-related things Unix-only

There is no system bus on Windows, and there won't be until/unless
it can be secure.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=83583Reviewed-by: Ralf Habacker's avatarRalf Habacker <ralf.habacker@freenet.de>
parent 3765075c
......@@ -33,9 +33,11 @@ CONFIG_IN_FILES= \
system.conf.in \
org.freedesktop.dbus-session.plist.in
config_DATA= \
session.conf \
system.conf
config_DATA = session.conf
if DBUS_UNIX
config_DATA += system.conf
endif
if DBUS_ENABLE_LAUNCHD
agentdir=$(LAUNCHD_AGENT_DIR)
......@@ -169,11 +171,11 @@ if DBUS_ENABLE_EMBEDDED_TESTS
## even when not doing "make check"
# run as a test by test/Makefile.am
noinst_PROGRAMS += test-bus test-bus-system
noinst_PROGRAMS += test-bus
if DBUS_UNIX
# run as a test by test/Makefile.am
noinst_PROGRAMS += test-bus-launch-helper
noinst_PROGRAMS += test-bus-launch-helper test-bus-system
# this is used by the tests but is not,itself, a test
noinst_PROGRAMS += dbus-daemon-launch-helper-test
endif DBUS_UNIX
......@@ -203,11 +205,13 @@ clean-local:
/bin/rm *.bb *.bbg *.da *.gcov || true
install-data-hook:
$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus
$(mkinstalldirs) $(DESTDIR)$(configdir)/system.d
$(mkinstalldirs) $(DESTDIR)$(configdir)/session.d
$(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services
if DBUS_UNIX
$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus
$(mkinstalldirs) $(DESTDIR)$(configdir)/system.d
$(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/system-services
endif
if HAVE_SYSTEMD
# Install dbus.socket as default implementation of a D-Bus stack.
# Deliberately not using $(LN_S) here: ln -fs is not universally portable,
......
......@@ -400,13 +400,8 @@ endif (MSVC_IDE)
endif (NOT $ENV{TEMP} STREQUAL "")
endif (NOT $ENV{TMPDIR} STREQUAL "")
# TODO: fix redhet
if (WIN32)
# bus-test expects a non empty string
set (DBUS_SYSTEM_PID_FILE "/dbus-pid")
else (WIN32)
set (DBUS_SYSTEM_PID_FILE ${EXPANDED_LOCALSTATEDIR}/run/dbus/pid)
endif (WIN32)
# Not used on Windows, where there is no system bus
set (DBUS_SYSTEM_PID_FILE ${EXPANDED_LOCALSTATEDIR}/run/dbus/pid)
if (WIN32)
set (DBUS_CONSOLE_AUTH_DIR "")
......
......@@ -75,12 +75,12 @@ TEST_BINARIES = \
## since they depend on stuff from this directory
TESTS = \
../bus/test-bus$(EXEEXT) \
../bus/test-bus-system$(EXEEXT) \
../dbus/test-dbus$(EXEEXT) \
$(NULL)
if DBUS_UNIX
TESTS += ../bus/test-bus-launch-helper$(EXEEXT)
TESTS += ../bus/test-bus-system$(EXEEXT)
endif
else !DBUS_ENABLE_EMBEDDED_TESTS
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment