summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-07-30 05:43:06 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-07-30 18:10:44 (GMT)
commit9e95049b129fcc2ee14737ddf1f67fa40c98510c (patch)
tree0c89d0da08cbd8ca46f0f984a04662281a3fd17c
parent9e44f8980b8f41fbeea0a68035865e5778e4dc7d (diff)
downloadgit-9e95049b129fcc2ee14737ddf1f67fa40c98510c.zip
git-9e95049b129fcc2ee14737ddf1f67fa40c98510c.tar.gz
git-9e95049b129fcc2ee14737ddf1f67fa40c98510c.tar.bz2
NO_OPENSSL should really mean no openssl.
Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index c0463c6..7b97be6 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