From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Date: Wed, 5 Apr 2006 14:22:40 +0000 (+0200)
Subject: Fix compile with expat, but an old curl version
X-Git-Tag: v1.3.0-rc3~4^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=459a21bd35675e140e19569e8b5c62c7fc4eee5b;p=git.git

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

diff --git a/Makefile b/Makefile
index c7d5ecf4f..164151999 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