summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2005-07-28 14:51:41 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-07-29 07:12:03 (GMT)
commitbfb15365b0e9ebb2e4f3facca282c7f585f96e3f (patch)
tree1d2e19b8765db51250ff238bc8770175f4c61893 /Makefile
parent148519b7dc5a45ee73a85d39e4647099976be3b8 (diff)
downloadgit-bfb15365b0e9ebb2e4f3facca282c7f585f96e3f.zip
git-bfb15365b0e9ebb2e4f3facca282c7f585f96e3f.tar.gz
git-bfb15365b0e9ebb2e4f3facca282c7f585f96e3f.tar.bz2
[PATCH] socklen_t needs to be defined and libssl to be linked on old Mac OS X
On older Mac OS X (10.2.8), no socklen_t is defined, and therefore daemon.c does not compile. However, Mac OS X 10.4 seems to define socklen_t differently. Also, linking fails due to some symbols defined in libssl (not just libcrypto). [jc: I am tentatively dropping the socklen_t part of the patch because I am waiting for confirmation on the server side IPV6 patch from Yoshifuji-san] Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index f50ad72..f580576 100644
--- a/Makefile
+++ b/Makefile
@@ -95,9 +95,13 @@ ifdef PPC_SHA1
LIB_OBJS += ppc/sha1.o ppc/sha1ppc.o
else
SHA1_HEADER=<openssl/sha.h>
+ifeq ($(shell uname -s),Darwin)
+ LIBS += -lcrypto -lssl
+else
LIBS += -lcrypto
endif
endif
+endif
CFLAGS += '-DSHA1_HEADER=$(SHA1_HEADER)'