summaryrefslogtreecommitdiffabout
authorMikhail Gusarov <dottedmag@dottedmag.net>2009-10-28 21:39:55 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-11-07 15:23:19 (UTC)
commit59310ab102a448d90c337b3b138dd53681d8097e (patch) (unidiff)
tree6b2d1aa00ed31247bf06b87722a35b1f75ceb093
parent4b1fee00ddfbb7bfb48f85bef49b5aff928d0f2e (diff)
downloadcgit-59310ab102a448d90c337b3b138dd53681d8097e.zip
cgit-59310ab102a448d90c337b3b138dd53681d8097e.tar.gz
cgit-59310ab102a448d90c337b3b138dd53681d8097e.tar.bz2
Add NO_OPENSSL option
Linking with OpenSSL is not always desirable. Add NO_OPENSSL option to use SHA-1 code bundled with Git. Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile15
1 files changed, 12 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 60d8c58..4e101d3 100644
--- a/Makefile
+++ b/Makefile
@@ -12,4 +12,7 @@ INSTALL = install
12# Define NO_STRCASESTR if you don't have strcasestr. 12# Define NO_STRCASESTR if you don't have strcasestr.
13# 13#
14# Define NO_OPENSSL to disable linking with OpenSSL and use bundled SHA1
15# implementation (slower).
16#
14# Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin). 17# Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin).
15# 18#
@@ -69,5 +72,5 @@ endif
69 72
70 73
71EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto 74EXTLIBS = git/libgit.a git/xdiff/lib.a -lz
72OBJECTS = 75OBJECTS =
73OBJECTS += cache.o 76OBJECTS += cache.o
@@ -124,4 +127,10 @@ ifdef NO_STRCASESTR
124 CFLAGS += -DNO_STRCASESTR 127 CFLAGS += -DNO_STRCASESTR
125endif 128endif
129ifdef NO_OPENSSL
130 CFLAGS += -DNO_OPENSSL
131 GIT_OPTIONS += NO_OPENSSL=1
132else
133 EXTLIBS += -lcrypto
134endif
126 135
127cgit: $(OBJECTS) libgit 136cgit: $(OBJECTS) libgit
@@ -133,6 +142,6 @@ cgit.o: VERSION
133 142
134libgit: 143libgit:
135 $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 libgit.a 144 $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 $(GIT_OPTIONS) libgit.a
136 $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 xdiff/lib.a 145 $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 $(GIT_OPTIONS) xdiff/lib.a
137 146
138test: all 147test: all