From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 20 Dec 2009 22:49:45 +0000 (+0100)
Subject: neon: add optional ssl support
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2f3c46561e585ba698e73a91bbff03b2e3be411c;p=buildroot.git

neon: add optional ssl support

Signed-off-by: Nigel Kukard <nkukard@lbsd.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---

diff --git a/CHANGES b/CHANGES
index 01b25aa312..4d439bcebf 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,8 +3,9 @@
 	New packages: libcdaudio, libdvdnav, libdvdread, hostapd, tcpreplay
 
 	Updated/fixed packages: autoconf, bind, binutils, busybox,
-	directfb, gst-plugins-bad, hal, iw, libfuse, libpcap, lighttpd,
-	mesa, mpg123, mtd-utils, pcre, qt, sshfs, tremor, u-boot, usbutils
+	directfb, gst-plugins-bad, hal, iw, libfuse, libpcap,
+	lighttpd, mesa, mpg123, mtd-utils, neon, pcre, qt, sshfs,
+	tremor, u-boot, usbutils
 
 	Issues resolved (http://bugs.uclibc.org):
 
diff --git a/package/neon/Config.in b/package/neon/Config.in
index ce72a2fb6c..318e4c6a31 100644
--- a/package/neon/Config.in
+++ b/package/neon/Config.in
@@ -12,6 +12,12 @@ config BR2_PACKAGE_NEON_ZLIB
 	help
 	  build with ZLIB support
 
+config BR2_PACKAGE_NEON_SSL
+	bool "SSL support"
+	select BR2_PACKAGE_OPENSSL
+	help
+	  build with SSL support
+
 choice
 	prompt "XML Support"
 	default BR2_PACKAGE_NEON_NOXML
diff --git a/package/neon/neon.mk b/package/neon/neon.mk
index 1f26a0c96d..ed5f999685 100644
--- a/package/neon/neon.mk
+++ b/package/neon/neon.mk
@@ -22,6 +22,12 @@ NEON_DEPENDENCIES+=zlib
 else
 NEON_CONF_OPT+=--without-zlib
 endif
+ifeq ($(BR2_PACKAGE_NEON_SSL),y)
+NEON_CONF_OPT+=--with-ssl
+NEON_DEPENDENCIES+=openssl
+else
+NEON_CONF_OPT+=--without-ssl
+endif
 ifeq ($(BR2_PACKAGE_NEON_EXPAT),y)
 NEON_CONF_OPT+=--with-expat=$(STAGING_DIR)/usr/lib/libexpat.la
 NEON_CONF_OPT+=--with-libxml2=no