diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-04-05 14:25:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-05 14:25:57 -0700 |
| commit | 806d097e6b1c2c996a2a01cf8eaf3d7326e70c3c (patch) | |
| tree | c6948a5616d06ab31edb8672801f8c2399e84db0 | |
| parent | Merge branch 'jc/combine' into next (diff) | |
| parent | Fix compile with expat, but an old curl version (diff) | |
| download | git-806d097e6b1c2c996a2a01cf8eaf3d7326e70c3c.tar.gz git-806d097e6b1c2c996a2a01cf8eaf3d7326e70c3c.zip | |
Merge branch 'nh/http' into next
* nh/http:
Fix compile with expat, but an old curl version
| -rw-r--r-- | Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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 |