diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-14 08:57:38 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-14 08:58:09 -0800 |
| commit | e6b71b32892bf1600e7edaab17426f634e7e5e5a (patch) | |
| tree | f48d2e4be78744011599d5505642673077796743 /Makefile | |
| parent | 0137ef7dae553f9eb89cbae1ddb60b72046ba28b (diff) | |
| parent | ada6a4117eb204fe14a83bc51daaf923cd8127ec (diff) | |
| download | git-e6b71b32892bf1600e7edaab17426f634e7e5e5a.tar.gz git-e6b71b32892bf1600e7edaab17426f634e7e5e5a.tar.xz | |
Merge branch 'maint'
* maint:
Prepare for 1.7.3.4
use persistent memory for rejected paths
do not overwrite files in leading path
lstat_cache: optionally return match_len
add function check_ok_to_remove()
t7607: add leading-path tests
t7607: use test-lib functions and check MERGE_HEAD
Do not link with -lcrypto under NO_OPENSSL
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -1303,11 +1303,15 @@ else BLK_SHA1 = 1 OPENSSL_LIBSSL = endif +ifdef NO_OPENSSL + LIB_4_CRYPTO = +else ifdef NEEDS_SSL_WITH_CRYPTO LIB_4_CRYPTO = $(OPENSSL_LINK) -lcrypto -lssl else LIB_4_CRYPTO = $(OPENSSL_LINK) -lcrypto endif +endif ifdef NEEDS_LIBICONV ifdef ICONVDIR BASIC_CFLAGS += -I$(ICONVDIR)/include |