- fixed dbus_bus_request_name

[platform/upstream/dbus.git] / dbus / Makefile.am

diff --git a/dbus/Makefile.am b/dbus/Makefile.am
index bb5ccca..7520382 100644 (file)
--- a/dbus/Makefile.am
+++ b/dbus/Makefile.am
@@ -12,6 +12,10 @@ AM_CPPFLAGS = \
        -DDBUS_SESSION_CONFIG_FILE=\""$(configdir)/session.conf"\" \
        $(NULL)
 
+# On Linux with glibc 2.17, sd-daemon.c support for POSIX message queues
+# results in an otherwise unnecessary dependency on librt. Disable it.
+AM_CPPFLAGS += -DSD_DAEMON_DISABLE_MQ
+
 # if assertions are enabled, improve backtraces
 AM_LDFLAGS = @R_DYNAMIC_LDFLAG@
 
@@ -102,6 +106,8 @@ DBUS_SHARED_arch_sources =                  \
        dbus-sysdeps-pthread.c                  \
        dbus-transport-unix.c                   \
        dbus-transport-unix.h                   \
+       dbus-transport-kdbus.c                  \
+       dbus-transport-kdbus.h                  \
        dbus-userdb.c                           \
        dbus-userdb.h                           \
        sd-daemon.c                             \
@@ -291,6 +297,17 @@ libdbus_internal_la_CPPFLAGS = \
        $(NULL)
 libdbus_internal_la_LIBADD=$(LIBDBUS_LIBS) $(SYSTEMD_LIBS)
 
+if DBUS_WIN
+# This must be a separate convenience library, otherwise libtool notices
+# that libdbus-1 might contain C++, links it with g++ and links in libstdc++,
+# even on Unix where in fact it doesn't contain any C++. For Windows, where
+# this code is used, we don't actually need libstdc++.
+noinst_LTLIBRARIES += libdbus-init-win.la
+libdbus_init_win_la_SOURCES = dbus-init-win.cpp
+libdbus_1_la_LIBADD += libdbus-init-win.la
+libdbus_internal_la_LIBADD += libdbus-init-win.la
+endif
+
 noinst_PROGRAMS =
 
 if DBUS_BUILD_TESTS
@@ -308,5 +325,5 @@ clean-local:
        /bin/rm *.bb *.bbg *.da *.gcov .libs/*.da .libs/*.bbg || true
 
 update-systemd:
-       curl http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.c > sd-daemon.c
-       curl http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.h > sd-daemon.h
+       curl http://cgit.freedesktop.org/systemd/systemd/plain/src/libsystemd-daemon/sd-daemon.c > $(srcdir)/sd-daemon.c
+       curl http://cgit.freedesktop.org/systemd/systemd/plain/src/systemd/sd-daemon.h > $(srcdir)/sd-daemon.h