diff options
| author | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-11-05 03:19:07 +0000 |
|---|---|---|
| committer | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-11-05 03:19:07 +0000 |
| commit | 52f10ff67fb41ea3738a4b0ab48b561c22200009 (patch) | |
| tree | 34be5f9820379f7b7a9edaad8fcba5e461b10663 /package/uhttpd/src/Makefile | |
| parent | 47cebba347fe9e484656576a0df3459921d517d5 (diff) | |
[package] uhttpd: rework CyaSSL and OpenSSL integration; move protected recv() and send() operations below the ssl layer - fixes hangs when accessing via https
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28761 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/uhttpd/src/Makefile')
| -rw-r--r-- | package/uhttpd/src/Makefile | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/package/uhttpd/src/Makefile b/package/uhttpd/src/Makefile index e18833e8f..9c3cc7f02 100644 --- a/package/uhttpd/src/Makefile +++ b/package/uhttpd/src/Makefile @@ -3,19 +3,17 @@ LUA_SUPPORT ?= 1 TLS_SUPPORT ?= 1 UHTTPD_TLS ?= cyassl -CFLAGS ?= -I./lua-5.1.4/src -I$(TLS_INCLUDE_DIR) -O0 -ggdb3 -LDFLAGS ?= -L./lua-5.1.4/src -L$(TLS_LIB_DIR) +CFLAGS ?= -I./lua-5.1.4/src $(TLS_CFLAGS) -O0 -ggdb3 +LDFLAGS ?= -L./lua-5.1.4/src $(TLS_LDFLAGS) CFLAGS += -Wall --std=gnu99 ifeq ($(UHTTPD_TLS),openssl) - TLS_LDFLAGS := -lssl - TLS_INCLUDE_DIR := ./openssl-0.9.8m/include - TLS_LIB_DIR := ./openssl-0.9.8m + TLS_LDFLAGS := -L./openssl-0.9.8m -lssl + TLS_CFLAGS := -I./openssl-0.9.8m/include -DTLS_IS_OPENSSL else - TLS_LDFLAGS := -lcyassl - TLS_INCLUDE_DIR := ./cyassl-1.4.0/include - TLS_LIB_DIR := ./cyassl-1.4.0/src/.libs + 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 @@ -31,15 +29,26 @@ ifeq ($(HAVE_SHADOW),yes) CFLAGS += -DHAVE_SHADOW endif -world: compile +ifeq ($(TLS_SUPPORT),1) + CFLAGS += -DHAVE_TLS +endif ifeq ($(CGI_SUPPORT),1) - OBJ += uhttpd-cgi.o CFLAGS += -DHAVE_CGI endif ifeq ($(LUA_SUPPORT),1) CFLAGS += -DHAVE_LUA +endif + + +world: compile + +ifeq ($(CGI_SUPPORT),1) + OBJ += uhttpd-cgi.o +endif + +ifeq ($(LUA_SUPPORT),1) LUALIB := uhttpd_lua.so $(LUALIB): uhttpd-lua.c @@ -49,12 +58,11 @@ ifeq ($(LUA_SUPPORT),1) endif ifeq ($(TLS_SUPPORT),1) - CFLAGS += -DHAVE_TLS TLSLIB := uhttpd_tls.so $(TLSLIB): uhttpd-tls.c $(CC) $(CFLAGS) $(LDFLAGS) $(FPIC) \ - -shared $(TLS_LDFLAGS) \ + -shared \ -o $(TLSLIB) uhttpd-tls.c endif |