summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-12-08 22:54:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-12-08 22:54:13 (GMT)
commit5b02b9baf728f6155e2996e5945e07f2e1a57b05 (patch)
tree37c4c32def1d8c24a07aea361c867e134107a2a1 /Makefile
parentf34e9edc7bbb41c52ff6a17dbffbef3d4979ee25 (diff)
downloadgit-5b02b9baf728f6155e2996e5945e07f2e1a57b05.zip
git-5b02b9baf728f6155e2996e5945e07f2e1a57b05.tar.gz
git-5b02b9baf728f6155e2996e5945e07f2e1a57b05.tar.bz2
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>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index cd0f648..5493086 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