From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Tue, 14 Jun 2011 16:44:35 +0000 (+0100)
Subject: Move knowledge of what the bus daemon/launcher need to link into bus/
X-Git-Tag: dbus-1.5.6~23
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=16aae2855dacdfacf453598c54ebfe47e790b27e;p=thirdparty%2Fdbus.git

Move knowledge of what the bus daemon/launcher need to link into bus/
---

diff --git a/bus/Makefile.am b/bus/Makefile.am
index 9ec128903..c83c80acc 100644
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -1,8 +1,22 @@
 configdir=$(sysconfdir)/dbus-1
 dbus_daemon_execdir = $(DBUS_DAEMONDIR)
 
+DBUS_BUS_LIBS = \
+	$(XML_LIBS) \
+	$(SELINUX_LIBS) \
+	$(THREAD_LIBS) \
+	$(ADT_LIBS) \
+	$(NETWORK_libs) \
+	$(NULL)
+
+DBUS_LAUNCHER_LIBS = \
+	$(XML_LIBS) \
+	$(THREAD_LIBS) \
+	$(NETWORK_libs) \
+	$(NULL)
+
 INCLUDES = -I$(top_srcdir) \
-	$(DBUS_BUS_CFLAGS) \
+	$(XML_CFLAGS) \
 	-DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \
 	-DDBUS_COMPILATION
 
diff --git a/configure.ac b/configure.ac
index 0b45e3723..1253d0a03 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1137,16 +1137,6 @@ AC_SUBST([NETWORK_libs])
 DBUS_CLIENT_LIBS="$THREAD_LIBS $NETWORK_libs"
 AC_SUBST(DBUS_CLIENT_LIBS)
 
-DBUS_BUS_CFLAGS="$XML_CFLAGS"
-DBUS_BUS_LIBS="$XML_LIBS $SELINUX_LIBS $THREAD_LIBS $ADT_LIBS $NETWORK_libs"
-AC_SUBST(DBUS_BUS_CFLAGS)
-AC_SUBST(DBUS_BUS_LIBS)
-
-DBUS_LAUNCHER_CFLAGS="$XML_CFLAGS"
-DBUS_LAUNCHER_LIBS="$XML_LIBS $THREAD_LIBS $NETWORK_libs"
-AC_SUBST(DBUS_LAUNCHER_CFLAGS)
-AC_SUBST(DBUS_LAUNCHER_LIBS)
-
 DBUS_TEST_LIBS="$THREAD_LIBS $NETWORK_libs"
 AC_SUBST(DBUS_TEST_LIBS)