Merge branch 'nh/http' into next

* nh/http:
  Fix compile with expat, but an old curl version
This commit is contained in:
Junio C Hamano 2006-04-05 14:25:57 -07:00
commit 806d097e6b

View File

@ -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