undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not link with -lcrypto under NO_OPENSSL

Browse Source 
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>
This commit is contained in:
Junio C Hamano 2010-12-08 14:54:13 -08:00
parent f34e9edc7b
commit 5b02b9baf7
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -1262,11 +1262,15 @@ else
BLK_SHA1 = 1 BLK_SHA1 = 1
OPENSSL_LIBSSL = OPENSSL_LIBSSL =
endif endif
ifdef NO_OPENSSL
LIB_4_CRYPTO =
else
ifdef NEEDS_SSL_WITH_CRYPTO ifdef NEEDS_SSL_WITH_CRYPTO
LIB_4_CRYPTO = $(OPENSSL_LINK) -lcrypto -lssl LIB_4_CRYPTO = $(OPENSSL_LINK) -lcrypto -lssl
else else
LIB_4_CRYPTO = $(OPENSSL_LINK) -lcrypto LIB_4_CRYPTO = $(OPENSSL_LINK) -lcrypto
endif endif
endif
ifdef NEEDS_LIBICONV ifdef NEEDS_LIBICONV
ifdef ICONVDIR ifdef ICONVDIR
BASIC_CFLAGS += -I$(ICONVDIR)/include BASIC_CFLAGS += -I$(ICONVDIR)/include