X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/0dd0ee49446c28f754f86795d566a90a64e1bcc3..502d6255c81bbbfa76c6fc153d2c57351ee85d32:/package/uhttpd/Makefile?ds=sidebyside

diff --git a/package/uhttpd/Makefile b/package/uhttpd/Makefile
index d5dbd0e39..e0e567af4 100644
--- a/package/uhttpd/Makefile
+++ b/package/uhttpd/Makefile
@@ -8,10 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uhttpd
-PKG_RELEASE:=24
+PKG_RELEASE:=30
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 PKG_CONFIG_DEPENDS := \
+	CONFIG_PACKAGE_uhttpd-mod-lua \
+	CONFIG_PACKAGE_uhttpd-mod-tls \
 	CONFIG_PACKAGE_uhttpd-mod-tls_cyassl \
 	CONFIG_PACKAGE_uhttpd-mod-tls_openssl
 
@@ -63,14 +65,18 @@ endef
 
 UHTTPD_TLS:=
 TLS_CFLAGS:=
+TLS_LDFLAGS:=
 
 ifneq ($(CONFIG_PACKAGE_uhttpd-mod-tls_cyassl),)
   UHTTPD_TLS:=cyassl
-  TLS_CFLAGS:=-I$(STAGING_DIR)/usr/include/cyassl
+  TLS_CFLAGS:=-I$(STAGING_DIR)/usr/include/cyassl -DTLS_IS_CYASSL
+  TLS_LDFLAGS:=-lcyassl -lm
 endif
 
 ifneq ($(CONFIG_PACKAGE_uhttpd-mod-tls_openssl),)
   UHTTPD_TLS:=openssl
+  TLS_CFLAGS:=-DTLS_IS_OPENSSL
+  TLS_LDFLAGS:=-lssl
 endif
 
 
@@ -86,7 +92,14 @@ endef
 
 
 TARGET_CFLAGS += $(TLS_CFLAGS)
-MAKE_VARS += FPIC="$(FPIC)" UHTTPD_TLS="$(UHTTPD_TLS)"
+TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
+MAKE_VARS += \
+	FPIC="$(FPIC)" \
+	LUA_SUPPORT="$(if $(CONFIG_PACKAGE_uhttpd-mod-lua),1)" \
+	TLS_SUPPORT="$(if $(CONFIG_PACKAGE_uhttpd-mod-tls),1)" \
+	UHTTPD_TLS="$(UHTTPD_TLS)" \
+	TLS_CFLAGS="$(TLS_CFLAGS)" \
+	TLS_LDFLAGS="$(TLS_LDFLAGS)"
 
 define Build/Prepare
 	mkdir -p $(PKG_BUILD_DIR)