Skip to content

Commit 459a21b

Browse files
dschoJunio C Hamano
authored andcommitted
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>
1 parent 8d9fbe5 commit 459a21b

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,10 +324,12 @@ ifndef NO_CURL
324324
curl_check := $(shell (echo 070908; curl-config --vernum) | sort -r | sed -ne 2p)
325325
ifeq "$(curl_check)" "070908"
326326
ifndef NO_EXPAT
327-
EXPAT_LIBEXPAT = -lexpat
328327
PROGRAMS += git-http-push$X
329328
endif
330329
endif
330+
ifndef NO_EXPAT
331+
EXPAT_LIBEXPAT = -lexpat
332+
endif
331333
endif
332334

333335
ifndef NO_OPENSSL

0 commit comments

Comments
 (0)