Make dbus depend on libxml2 and link with lib

diff --git a/package/dbus/Config.in b/package/dbus/Config.in
index 7d7640c7942c091306782b21158fb0b9ae3e9782..7e668ce84a0318c328d42f7b16d4bfa14ec227a0 100644 (file)
--- a/package/dbus/Config.in
+++ b/package/dbus/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_DBUS
        bool "dbus"
        default n
        select BR2_PACKAGE_EXPAT
+       select BR2_PACKAGE_LIBXML2
        help
          The D-Bus message bus system.
 

diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
index fba734bfd451d2079a46eee4048f3bdc74664325..ad961b0b03cc0f82b80b19560a52a19931e6e89c 100644 (file)
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@@ -51,7 +51,7 @@ $(DBUS_DIR)/.configured: $(DBUS_DIR)/.unpacked
        touch $@
 
 $(DBUS_DIR)/$(DBUS_BINARY): $(DBUS_DIR)/.configured
-       $(MAKE) DBUS_BUS_LIBS="$(STAGING_DIR)/usr/lib/libexpat.so" -C $(DBUS_DIR) all
+       $(MAKE) DBUS_BUS_LIBS="$(STAGING_DIR)/usr/lib/libexpat.so $(STAGING_DIR)/usr/lib/libxml2.so" -C $(DBUS_DIR) all
 
 $(STAGING_DIR)/usr/lib/libdbus-1.so: $(DBUS_DIR)/$(DBUS_BINARY)
        $(MAKE) DESTDIR=$(STAGING_DIR) -C $(DBUS_DIR)/dbus install
@@ -70,7 +70,7 @@ $(TARGET_DIR)/$(DBUS_TARGET_BINARY): $(STAGING_DIR)/usr/lib/libdbus-1.so
        -rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share
        rm -rf $(TARGET_DIR)/etc/rc.d
 
-dbus: uclibc expat $(TARGET_DIR)/$(DBUS_TARGET_BINARY)
+dbus: uclibc expat libxml2-headers $(TARGET_DIR)/$(DBUS_TARGET_BINARY)
 
 dbus-clean:
        rm -f $(TARGET_DIR)/etc/dbus-1/session.conf