Skip to content

Commit

Permalink
Fix compile with expat, but an old curl version
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Johannes Schindelin authored and Junio C Hamano committed Apr 5, 2006
1 parent 8d9fbe5 commit 459a21b
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -324,10 +324,12 @@ ifndef NO_CURL
curl_check := $(shell (echo 070908; curl-config --vernum) | sort -r | sed -ne 2p)
ifeq "$(curl_check)" "070908"
ifndef NO_EXPAT
EXPAT_LIBEXPAT = -lexpat
PROGRAMS += git-http-push$X
endif
endif
ifndef NO_EXPAT
EXPAT_LIBEXPAT = -lexpat
endif
endif

ifndef NO_OPENSSL
Expand Down

0 comments on commit 459a21b

Please sign in to comment.