uhttpd: fix Makefiles and linking of tls plugin

SVN-Revision: 28769

diff --git a/package/uhttpd/Makefile b/package/uhttpd/Makefile
index 66caaf14ee9d24ee2618d14399d8d954e78ee17a..14b1559c31b686f26bbbfe9f4d23ffd045824d05 100644 (file)
--- a/package/uhttpd/Makefile
+++ b/package/uhttpd/Makefile
@@ -70,11 +70,13 @@ TLS_LDFLAGS:=
 ifneq ($(CONFIG_PACKAGE_uhttpd-mod-tls_cyassl),)
   UHTTPD_TLS:=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
 
 
@@ -90,11 +92,14 @@ endef
 
 
 TARGET_CFLAGS += $(TLS_CFLAGS)
+TARGET_LDFLAGS += $(TLS_LDFLAGS)
 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)"
+       UHTTPD_TLS="$(UHTTPD_TLS)" \
+       TLS_CFLAGS="$(TLS_CFLAGS)" \
+       TLS_LDFLAGS="$(TLS_LDFLAGS)"
 
 define Build/Prepare
        mkdir -p $(PKG_BUILD_DIR)

diff --git a/package/uhttpd/src/Makefile b/package/uhttpd/src/Makefile
index 9c3cc7f02c1d823606f17f0906d10c878dca1689..5e98ab8750ac49d28b55cac24b181a64e443c095 100644 (file)
--- a/package/uhttpd/src/Makefile
+++ b/package/uhttpd/src/Makefile
@@ -4,16 +4,16 @@ TLS_SUPPORT ?= 1
 UHTTPD_TLS ?= cyassl
 
 CFLAGS ?= -I./lua-5.1.4/src $(TLS_CFLAGS) -O0 -ggdb3
-LDFLAGS ?= -L./lua-5.1.4/src $(TLS_LDFLAGS)
+LDFLAGS ?= -L./lua-5.1.4/src
 
 CFLAGS += -Wall --std=gnu99
 
 ifeq ($(UHTTPD_TLS),openssl)
-  TLS_LDFLAGS := -L./openssl-0.9.8m -lssl
-  TLS_CFLAGS := -I./openssl-0.9.8m/include -DTLS_IS_OPENSSL
+  TLS_LDFLAGS ?= -L./openssl-0.9.8m -lssl
+  TLS_CFLAGS ?= -I./openssl-0.9.8m/include -DTLS_IS_OPENSSL
 else
-  TLS_LDFLAGS := -L./cyassl-1.4.0/src/.libs -lcyassl
-  TLS_CFLAGS := -I./cyassl-1.4.0/include -DTLS_IS_CYASSL
+  TLS_LDFLAGS ?= -L./cyassl-1.4.0/src/.libs -lcyassl
+  TLS_CFLAGS ?= -I./cyassl-1.4.0/include -DTLS_IS_CYASSL
 endif
 
 OBJ := uhttpd.o uhttpd-file.o uhttpd-utils.o
@@ -62,7 +62,7 @@ ifeq ($(TLS_SUPPORT),1)
 
   $(TLSLIB): uhttpd-tls.c
                $(CC) $(CFLAGS) $(LDFLAGS) $(FPIC) \
-                       -shared \
+                       -shared $(TLS_LDFLAGS) \
                        -o $(TLSLIB) uhttpd-tls.c
 endif