Makefile: Add NEEDS_CRYPTO_WITH_SSL
The Makefile comment for NEEDS_SSL_WITH_CRYPTO says to define it "if you need -lcrypto with -lssl (Darwin)." However, what it actually does is add -lssl when you use -lcrypto and not the other way around. However, libcrypto contains a majority of the ERR_* functions from OpenSSL (at least on OS X) so we need it both ways. So, add NEEDS_CRYPTO_WITH_SSL which adds -lcrypto to the OpenSSL link flags and clarify the difference between it and NEEDS_SSL_WITH_CRYPTO. Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Brian Gernhardt committed
Sep 8, 2009 at 09:54 UTC
0460dba4b4c47ac0b11ccb85b319792280422bc9
1 file changed
+7
-1
Makefile
+7
-1
@@ -91,7 +91,9 @@ all::
91
# Define PPC_SHA1 environment variable when running make to make use of
92
# a bundled SHA1 routine optimized for PowerPC.
93
#
94
-# Define NEEDS_SSL_WITH_CRYPTO if you need -lcrypto with -lssl (Darwin).
94
+# Define NEEDS_CRYPTO_WITH_SSL if you need -lcrypto when using -lssl (Darwin).
95
+#
96
+# Define NEEDS_SSL_WITH_CRYPTO if you need -lssl when using -lcrypto (Darwin).
97
#
98
# Define NEEDS_LIBICONV if linking with libc is not enough (Darwin).
99
#
@@ -704,6 +706,7 @@ ifeq ($(uname_S),SCO_SV)
706
TAR = gtar
707
endif
708
ifeq ($(uname_S),Darwin)
709
+ NEEDS_CRYPTO_WITH_SSL = YesPlease
710
NEEDS_SSL_WITH_CRYPTO = YesPlease
711
NEEDS_LIBICONV = YesPlease
712
ifeq ($(shell expr "$(uname_R)" : '[15678]\.'),2)
@@ -1007,6 +1010,9 @@ ifndef NO_OPENSSL
1010
else
1011
OPENSSL_LINK =
1012
endif
1013
+ ifdef NEEDS_CRYPTO_WITH_SSL
1014
+ OPENSSL_LINK += -lcrypto
1015
+ endif
1016
else
1017
BASIC_CFLAGS += -DNO_OPENSSL
1018
BLK_SHA1 = 1