dbus: prefer expat if available even if libxml2 also is
authorPeter Korsgaard <jacmet@sunsite.dk>
Sun, 27 Sep 2009 19:45:11 +0000 (21:45 +0200)
committerPeter Korsgaard <jacmet@sunsite.dk>
Sun, 27 Sep 2009 19:45:11 +0000 (21:45 +0200)
dbus-glib needs dbus to be compiled with expat support, so prefer that
mode even if libxml2 is also enabled.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
package/dbus/Config.in

index 9b800d5e5b06b52da1bd6a5b55cbd00abfe93c65..c625382b8a221735ab57b186008c9624a8bdbdb4 100644 (file)
@@ -12,7 +12,7 @@ comment "dbus not available (need expat or libxml2)"
 choice
        prompt "XML library to use"
        depends on BR2_PACKAGE_DBUS
-       default BR2_DBUS_LIBXML2 if BR2_PACKAGE_LIBXML2
+       default BR2_DBUS_LIBXML2 if (BR2_PACKAGE_LIBXML2 && !BR2_PACKAGE_EXPAT)
        default BR2_DBUS_EXPAT
        help
          Select the XML library to use with D-Bus. Select Expat