From 2f3c46561e585ba698e73a91bbff03b2e3be411c Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 20 Dec 2009 23:49:45 +0100 Subject: neon: add optional ssl support Signed-off-by: Nigel Kukard Signed-off-by: Peter Korsgaard --- CHANGES | 5 +++-- package/neon/Config.in | 6 ++++++ package/neon/neon.mk | 6 ++++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 01b25aa31..4d439bceb 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 ce72a2fb6..318e4c6a3 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 1f26a0c96..ed5f99968 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 -- cgit v1.2.3