undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/maint-no-openssl-build-fix' into maint

Browse Source 
* jc/maint-no-openssl-build-fix:
  Do not link with -lcrypto under NO_OPENSSL
This commit is contained in:
Junio C Hamano 2010-12-14 07:50:20 -08:00
commit 40d675f417
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -1262,11 +1262,15 @@ else
BLK_SHA1 = 1 BLK_SHA1 = 1
OPENSSL_LIBSSL = OPENSSL_LIBSSL =
endif endif
ifdef NO_OPENSSL
LIB_4_CRYPTO =
else
ifdef NEEDS_SSL_WITH_CRYPTO ifdef NEEDS_SSL_WITH_CRYPTO
LIB_4_CRYPTO = $(OPENSSL_LINK) -lcrypto -lssl LIB_4_CRYPTO = $(OPENSSL_LINK) -lcrypto -lssl
else else
LIB_4_CRYPTO = $(OPENSSL_LINK) -lcrypto LIB_4_CRYPTO = $(OPENSSL_LINK) -lcrypto
endif endif
endif
ifdef NEEDS_LIBICONV ifdef NEEDS_LIBICONV
ifdef ICONVDIR ifdef ICONVDIR
BASIC_CFLAGS += -I$(ICONVDIR)/include BASIC_CFLAGS += -I$(ICONVDIR)/include