summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Lars Schneider <larsxschneider@gmail.com>2016-11-06 20:35:04 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-11-10 11:10:36 -0800
commitf01fe92b82be0c3ff1569a2fc719162758bba065 (patch)
treea1dd55e0bb47d3ba39bfe99744201b052de6b9e2
parentPrepare for 2.9.4 (diff)
downloadtgif-f01fe92b82be0c3ff1569a2fc719162758bba065.tar.xz
Makefile: set NO_OPENSSL on macOS by default
Apple removed the OpenSSL header files in macOS 10.11 and above. OpenSSL was deprecated since macOS 10.7. Set `NO_OPENSSL` and `APPLE_COMMON_CRYPTO` to `YesPlease` as default for macOS. It is possible to override this and use OpenSSL by defining `NO_APPLE_COMMON_CRYPTO`. Original-patch-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Lars Schneider <larsxschneider@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 13ed57fd08..d93daffeb7 100644
--- a/Makefile
+++ b/Makefile
@@ -1023,6 +1023,7 @@ ifeq ($(uname_S),Darwin)
endif
endif
ifndef NO_APPLE_COMMON_CRYPTO
+ NO_OPENSSL = YesPlease
APPLE_COMMON_CRYPTO = YesPlease
COMPAT_CFLAGS += -DAPPLE_COMMON_CRYPTO
endif