Browse Source

NO_OPENSSL should really mean no openssl.

Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Junio C Hamano 20 years ago
parent
commit
9e95049b12
  1. 4
      Makefile

4
Makefile

@ -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

Loading…
Cancel
Save