summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2006-04-05 14:22:40 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-04-05 19:49:56 (GMT)
commit459a21bd35675e140e19569e8b5c62c7fc4eee5b (patch)
tree0e1b6ba1909b27490757f5601c9a3962dbe80884 /Makefile
parent8d9fbe57b3acf756a9325884d11f004ef6f7e884 (diff)
downloadgit-459a21bd35675e140e19569e8b5c62c7fc4eee5b.zip
git-459a21bd35675e140e19569e8b5c62c7fc4eee5b.tar.gz
git-459a21bd35675e140e19569e8b5c62c7fc4eee5b.tar.bz2
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>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index c7d5ecf..1641519 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