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>
Junio C Hamano committed
Dec 8, 2010 at 14:54 UTC
5b02b9baf728f6155e2996e5945e07f2e1a57b05
1 file changed
+4
Makefile
+4
@@ -1262,11 +1262,15 @@ else
1262
BLK_SHA1 = 1
1263
OPENSSL_LIBSSL =
1264
endif
1265
+ifdef NO_OPENSSL
1266
+ LIB_4_CRYPTO =
1267
+else
1268
ifdef NEEDS_SSL_WITH_CRYPTO
1269
LIB_4_CRYPTO = $(OPENSSL_LINK) -lcrypto -lssl
1270
else
1271
LIB_4_CRYPTO = $(OPENSSL_LINK) -lcrypto
1272
endif
1273
+endif
1274
ifdef NEEDS_LIBICONV
1275
ifdef ICONVDIR
1276
BASIC_CFLAGS += -I$(ICONVDIR)/include