* Refined building of neon options

- Added support to build with or without zlib support

diff --git a/package/neon/Config.in b/package/neon/Config.in
index 1ffb61a35ab3062ab2fda221f2e58fa7bf463c55..e9050742ba5f38dc1812fbeb1dea913e41a8527a 100644 (file)
--- a/package/neon/Config.in
+++ b/package/neon/Config.in
@@ -6,6 +6,13 @@ config BR2_PACKAGE_NEON
 
          http://www.webdav.org/neon/
 
+config BR2_PACKAGE_NEON_ZLIB
+       bool "ZLIB support"
+       depends on BR2_PACKAGE_NEON
+       select BR2_PACKAGE_ZLIB
+       help
+         build with ZLIB support
+
 choice
        prompt "XML Support"
        default BR2_PACKAGE_NEON_NOXML

diff --git a/package/neon/neon.mk b/package/neon/neon.mk
index e92e134b6524a8315b443f2048236d4b298c3396..61cf7527e069a51fe2795fd6c9ffe39ce03588cf 100644 (file)
--- a/package/neon/neon.mk
+++ b/package/neon/neon.mk
@@ -16,6 +16,12 @@ NEON_CONF_OPT+=--with-libxml2=yes
 NEON_CONF_OPT+=--with-expat=no
 NEON_DEPENDENCIES+=libxml2
 endif
+ifeq ($(BR2_PACKAGE_NEON_ZLIB),y)
+NEON_CONF_OPT+=--with-zlib=$(STAGING_DIR)
+NEON_DEPENDENCIES+=zlib
+else
+NEON_CONF_OPT+=--without-zlib
+endif
 ifeq ($(BR2_PACKAGE_NEON_EXPAT),y)
 NEON_CONF_OPT+=--with-expat=$(STAGING_DIR)/usr/lib/libexpat.la
 NEON_CONF_OPT+=--with-libxml2=no