RepoMirrors
/
haproxy
mirror of http://git.haproxy.org/git/haproxy.git/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BUILD: shctx: allow to be built without openssl 

The shctx functions does not depend of openssl anymore, allows to build
them without openssl.
This commit is contained in:
William Lallemand 2017-11-02 16:00:51 +01:00 committed by Willy Tarreau
parent 7c2a2ad65c
commit b620e987d0
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -603,7 +603,10 @@ OPTIONS_LDFLAGS += $(if $(SSL_LIB),-L$(SSL_LIB)) -lssl -lcrypto
ifneq ($(USE_DL),) ifneq ($(USE_DL),)
OPTIONS_LDFLAGS += -ldl OPTIONS_LDFLAGS += -ldl
endif 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),) ifneq ($(USE_PRIVATE_CACHE),)
OPTIONS_CFLAGS += -DUSE_PRIVATE_CACHE OPTIONS_CFLAGS += -DUSE_PRIVATE_CACHE
else else
@ -616,7 +619,6 @@ OPTIONS_CFLAGS += -DUSE_SYSCALL_FUTEX
endif endif
endif endif
endif endif
endif
ifneq ($(USE_LUA),) ifneq ($(USE_LUA),)
check_lua_lib = $(shell echo "int main(){}" | $(CC) -o /dev/null -x c - $(2) -l$(1) 2>/dev/null && echo $(1)) 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/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_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/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_OBJS = $(EBTREE_DIR)/ebtree.o \
$(EBTREE_DIR)/eb32tree.o $(EBTREE_DIR)/eb64tree.o \ $(EBTREE_DIR)/eb32tree.o $(EBTREE_DIR)/eb64tree.o \