Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
NO_OPENSSL should really mean no openssl.
author
Junio C Hamano
<junkio@cox.net>
Sat, 30 Jul 2005 05:43:06 +0000
(22:43 -0700)
committer
Junio C Hamano
<junkio@cox.net>
Sat, 30 Jul 2005 18:10:44 +0000
(11:10 -0700)
Signed-off-by: Junio C Hamano <junkio@cox.net>
Makefile
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
9e44f89
)
diff --git
a/Makefile
b/Makefile
index c0463c6215acd53782740e6481396fae654953e1..7b97be65f9feb82f39bfab0860daec080e7e14a2 100644
(file)
--- 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