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

diff --git a/bus/Makefile.am b/bus/Makefile.am
index 9ec1289..c83c80a 100644 (file)
--- 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 0b45e37..1253d0a 100644 (file)
--- 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)