From: Junio C Hamano Date: Sat, 30 Jul 2005 05:43:06 +0000 (-0700) Subject: NO_OPENSSL should really mean no openssl. X-Git-Tag: v0.99.3~21 X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=9e95049b129fcc2ee14737ddf1f67fa40c98510c;p=git.git NO_OPENSSL should really mean no openssl. Signed-off-by: Junio C Hamano --- diff --git a/Makefile b/Makefile index c0463c62..7b97be65 100644 --- a/Makefile +++ b/Makefile @@ -107,9 +107,11 @@ LIBS += -lz ifndef NO_OPENSSL LIB_OBJS += epoch.o + OPENSSL_LIBSSL=-lssl else CFLAGS += '-DNO_OPENSSL' MOZILLA_SHA1=1 + OPENSSL_LIBSSL= endif ifdef MOZILLA_SHA1 SHA1_HEADER="mozilla-sha1/sha1.h" @@ -147,7 +149,7 @@ git-ssh-pull: rsh.o pull.o git-ssh-push: rsh.o git-http-pull: LIBS += -lcurl -git-rev-list: LIBS += -lssl +git-rev-list: LIBS += $(OPENSSL_LIBSSL) $(LIB_OBJS): $(LIB_H) $(DIFF_OBJS): diffcore.h