Commit 799edfaa authored by michael-grunder's avatar michael-grunder
Browse files

Don't link with crypto libs if USE_SSL isn't set.

parent f74b0818
...@@ -91,17 +91,19 @@ ifeq ($(TEST_ASYNC),1) ...@@ -91,17 +91,19 @@ ifeq ($(TEST_ASYNC),1)
export CFLAGS+=-DHIREDIS_TEST_ASYNC export CFLAGS+=-DHIREDIS_TEST_ASYNC
endif endif
ifeq ($(uname_S),Linux) ifeq ($(USE_SSL),1)
ifdef OPENSSL_PREFIX ifeq ($(uname_S),Linux)
ifdef OPENSSL_PREFIX
CFLAGS+=-I$(OPENSSL_PREFIX)/include
SSL_LDFLAGS+=-L$(OPENSSL_PREFIX)/lib -lssl -lcrypto
else
SSL_LDFLAGS=-lssl -lcrypto
endif
else
OPENSSL_PREFIX?=/usr/local/opt/openssl
CFLAGS+=-I$(OPENSSL_PREFIX)/include CFLAGS+=-I$(OPENSSL_PREFIX)/include
SSL_LDFLAGS+=-L$(OPENSSL_PREFIX)/lib -lssl -lcrypto SSL_LDFLAGS+=-L$(OPENSSL_PREFIX)/lib -lssl -lcrypto
else
SSL_LDFLAGS=-lssl -lcrypto
endif endif
else
OPENSSL_PREFIX?=/usr/local/opt/openssl
CFLAGS+=-I$(OPENSSL_PREFIX)/include
SSL_LDFLAGS+=-L$(OPENSSL_PREFIX)/lib -lssl -lcrypto
endif endif
ifeq ($(uname_S),FreeBSD) ifeq ($(uname_S),FreeBSD)
...@@ -231,7 +233,10 @@ hiredis-example-push: examples/example-push.c $(STLIBNAME) ...@@ -231,7 +233,10 @@ hiredis-example-push: examples/example-push.c $(STLIBNAME)
examples: $(EXAMPLES) examples: $(EXAMPLES)
TEST_LIBS = $(STLIBNAME) $(SSL_STLIB) TEST_LIBS = $(STLIBNAME) $(SSL_STLIB)
TEST_LDFLAGS = $(SSL_LDFLAGS) -lssl -lcrypto -lpthread TEST_LDFLAGS = $(SSL_LDFLAGS)
ifeq ($(USE_SSL),1)
TEST_LDFLAGS += -pthread
endif
ifeq ($(TEST_ASYNC),1) ifeq ($(TEST_ASYNC),1)
TEST_LDFLAGS += -levent TEST_LDFLAGS += -levent
endif endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment