summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-04-05 21:25:57 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-04-05 21:25:57 (GMT)
commit806d097e6b1c2c996a2a01cf8eaf3d7326e70c3c (patch)
treec6948a5616d06ab31edb8672801f8c2399e84db0 /Makefile
parentd6102b53c8fcbc45567e48e3db1d1cb8498b0b94 (diff)
parent459a21bd35675e140e19569e8b5c62c7fc4eee5b (diff)
downloadgit-806d097e6b1c2c996a2a01cf8eaf3d7326e70c3c.zip
git-806d097e6b1c2c996a2a01cf8eaf3d7326e70c3c.tar.gz
git-806d097e6b1c2c996a2a01cf8eaf3d7326e70c3c.tar.bz2
Merge branch 'nh/http' into next
* nh/http: Fix compile with expat, but an old curl version
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 3471177..6b10eaa 100644
--- a/Makefile
+++ b/Makefile
@@ -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