From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 8 Dec 2010 22:54:13 +0000 (-0800)
Subject: Do not link with -lcrypto under NO_OPENSSL
X-Git-Tag: v1.7.3.4~8^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5b02b9baf728f6155e2996e5945e07f2e1a57b05;p=git.git

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 <gitster@pobox.com>
---

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