rpm: needs XML support in libneon

RPM-5.2.0 needs the optional XML support in libneon.

Restructure kconfig dependencies to ensure rpm can only be selected
if libneon with XML support (in addition to SSL + ZLIB) is enabled.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/package/rpm/Config.in b/package/rpm/Config.in
index e6e8769c0d0120813cc3f94a15acab307e93f8cd..448606c336a4c3cddf95c3a06a7c41bca517106e 100644 (file)
--- a/package/rpm/Config.in
+++ b/package/rpm/Config.in
@@ -1,12 +1,14 @@
+comment "rpm requires libneon with SSL, XML and ZLIB support"
+       depends on !BR2_PACKAGE_NEON || BR2_PACKAGE_NEON_NOXML
+
 config BR2_PACKAGE_RPM
        bool "rpm"
        select BR2_PACKAGE_BEECRYPT
        select BR2_PACKAGE_POPT
        select BR2_PACKAGE_OPENSSL
-       select BR2_PACKAGE_NEON
+       depends on BR2_PACKAGE_NEON
+       depends on !BR2_PACKAGE_NEON_NOXML
        select BR2_PACKAGE_NEON_ZLIB
-       select BR2_PACKAGE_NEON_EXPAT if BR2_PACKAGE_EXPAT
-       select BR2_PACKAGE_NEON_LIBXML2 if BR2_PACKAGE_LIBXML2
        select BR2_PACKAGE_NEON_SSL
        help
          The RPM package management system.