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

NO_OPENSSL should really mean no openssl.

Browse Source 
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2005-07-29 22:43:06 -07:00
parent 9e44f8980b
commit 9e95049b12
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -107,9 +107,11 @@ LIBS += -lz
ifndef NO_OPENSSL ifndef NO_OPENSSL
LIB_OBJS += epoch.o LIB_OBJS += epoch.o
OPENSSL_LIBSSL=-lssl
else else
CFLAGS += '-DNO_OPENSSL' CFLAGS += '-DNO_OPENSSL'
MOZILLA_SHA1=1 MOZILLA_SHA1=1
OPENSSL_LIBSSL=
endif endif
ifdef MOZILLA_SHA1 ifdef MOZILLA_SHA1
SHA1_HEADER="mozilla-sha1/sha1.h" SHA1_HEADER="mozilla-sha1/sha1.h"
@ -147,7 +149,7 @@ git-ssh-pull: rsh.o pull.o
git-ssh-push: rsh.o git-ssh-push: rsh.o
git-http-pull: LIBS += -lcurl git-http-pull: LIBS += -lcurl
git-rev-list: LIBS += -lssl git-rev-list: LIBS += $(OPENSSL_LIBSSL)
$(LIB_OBJS): $(LIB_H) $(LIB_OBJS): $(LIB_H)
$(DIFF_OBJS): diffcore.h $(DIFF_OBJS): diffcore.h