]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Do not link with -lcrypto under NO_OPENSSL
authorJunio C Hamano <gitster@pobox.com>
Wed, 8 Dec 2010 22:54:13 +0000 (14:54 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Dec 2010 22:54:13 +0000 (14:54 -0800)
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>
Makefile

index cd0f6481721f9ec47bdc2c0da93936fdfe806a2c..5493086e5707e7a3f558e13909b34ac1f5ef4166 100644 (file)
--- 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