From 5b02b9baf728f6155e2996e5945e07f2e1a57b05 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 8 Dec 2010 14:54:13 -0800 Subject: [PATCH] Do not link with -lcrypto under NO_OPENSSL With 401857c (imap-send: link against libcrypto for HMAC and others, 2010-11-24) we started linking imap-send unconditionally with -lcrypto by mistake; disable this when we are building under NO_OPENSSL. Signed-off-by: Junio C Hamano --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index cd0f64817..5493086e5 100644 --- a/Makefile +++ b/Makefile @@ -1262,11 +1262,15 @@ else BLK_SHA1 = 1 OPENSSL_LIBSSL = endif +ifdef NO_OPENSSL + LIB_4_CRYPTO = +else ifdef NEEDS_SSL_WITH_CRYPTO LIB_4_CRYPTO = $(OPENSSL_LINK) -lcrypto -lssl else LIB_4_CRYPTO = $(OPENSSL_LINK) -lcrypto endif +endif ifdef NEEDS_LIBICONV ifdef ICONVDIR BASIC_CFLAGS += -I$(ICONVDIR)/include -- 2.30.2