From b620e987d0ba5ad4c79f7c6acb0ee73f8c027a4b Mon Sep 17 00:00:00 2001 From: William Lallemand Date: Thu, 2 Nov 2017 16:00:51 +0100 Subject: [PATCH] BUILD: shctx: allow to be built without openssl The shctx functions does not depend of openssl anymore, allows to build them without openssl. --- Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 8f1bcd220..f066f3102 100644 --- a/Makefile +++ b/Makefile @@ -603,7 +603,10 @@ OPTIONS_LDFLAGS += $(if $(SSL_LIB),-L$(SSL_LIB)) -lssl -lcrypto ifneq ($(USE_DL),) OPTIONS_LDFLAGS += -ldl endif -OPTIONS_OBJS += src/ssl_sock.o src/shctx.o +OPTIONS_OBJS += src/ssl_sock.o +endif + +# The private cache option affect the way the shctx is built ifneq ($(USE_PRIVATE_CACHE),) OPTIONS_CFLAGS += -DUSE_PRIVATE_CACHE else @@ -616,7 +619,6 @@ OPTIONS_CFLAGS += -DUSE_SYSCALL_FUTEX endif endif endif -endif ifneq ($(USE_LUA),) check_lua_lib = $(shell echo "int main(){}" | $(CC) -o /dev/null -x c - $(2) -l$(1) 2>/dev/null && echo $(1)) @@ -857,7 +859,7 @@ OBJS = src/cfgparse.o src/proto_http.o src/stats.o src/server.o src/stream.o \ src/raw_sock.o src/lb_chash.o src/lb_fwlc.o src/lb_fwrr.o \ src/lb_fas.o src/applet.o src/hdr_idx.o src/ev_select.o src/hash.o \ src/lb_map.o src/base64.o src/sha1.o src/protocol.o src/h1.o \ - src/action.o src/hathreads.o src/mux_pt.o src/cache.o + src/action.o src/hathreads.o src/mux_pt.o src/cache.o src/shctx.o EBTREE_OBJS = $(EBTREE_DIR)/ebtree.o \ $(EBTREE_DIR)/eb32tree.o $(EBTREE_DIR)/eb64tree.o \