From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 22 Jan 2013 15:05:04 +0000 (+0000)
Subject: uhttpd: always turn on TLS support, include ustream-ssl as a build dependency
X-Git-Tag: reboot~11516
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a4c7a953e5fb58a075c7cdedf8b2f8c86a771f22;p=openwrt%2Fstaging%2Fxback.git

uhttpd: always turn on TLS support, include ustream-ssl as a build dependency

SVN-Revision: 35295
---

diff --git a/package/network/services/uhttpd/Makefile b/package/network/services/uhttpd/Makefile
index 6f3d1507ae..f03ecc4398 100644
--- a/package/network/services/uhttpd/Makefile
+++ b/package/network/services/uhttpd/Makefile
@@ -18,11 +18,11 @@ PKG_SOURCE_VERSION:=14e3971c37e6feb0ec5eda0988e07d8a786ba9f9
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
 
-PKG_CONFIG_DEPENDS = CONFIG_PACKAGE_uhttpd-mod-tls
+PKG_BUILD_DEPENDS = ustream-ssl
+
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
-
 define Package/uhttpd/default
   SECTION:=net
   CATEGORY:=Network
@@ -102,7 +102,7 @@ endef
 
 TARGET_LDFLAGS += -lcrypt
 
-CMAKE_OPTIONS = -DTLS_SUPPORT=$(if $(CONFIG_PACKAGE_uhttpd-mod-tls),on,off)
+CMAKE_OPTIONS = -DTLS_SUPPORT=on
 
 define Package/uhttpd/install
 	$(INSTALL_DIR) $(1)/etc/init.d