зеркало из https://github.com/microsoft/git.git
Fix compile with expat, but an old curl version
With an old curl version, git-http-push is not compiled. But git-http-fetch still needs to be linked with expat if NO_EXPAT is not defined. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Родитель
8d9fbe57b3
Коммит
459a21bd35
4
Makefile
4
Makefile
|
@ -324,10 +324,12 @@ ifndef NO_CURL
|
||||||
curl_check := $(shell (echo 070908; curl-config --vernum) | sort -r | sed -ne 2p)
|
curl_check := $(shell (echo 070908; curl-config --vernum) | sort -r | sed -ne 2p)
|
||||||
ifeq "$(curl_check)" "070908"
|
ifeq "$(curl_check)" "070908"
|
||||||
ifndef NO_EXPAT
|
ifndef NO_EXPAT
|
||||||
EXPAT_LIBEXPAT = -lexpat
|
|
||||||
PROGRAMS += git-http-push$X
|
PROGRAMS += git-http-push$X
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
ifndef NO_EXPAT
|
||||||
|
EXPAT_LIBEXPAT = -lexpat
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifndef NO_OPENSSL
|
ifndef NO_OPENSSL
|
||||||
|
|
Загрузка…
Ссылка в новой задаче