threads / patch / 3801

patchFix compile with expat, but an old curl version

Subject: [PATCH] Fix compile with expat, but an old curl version

## tl;dr

One message between Apr 5, 2006 and Apr 5, 2006. Diffs are folded; open one to read it.

replies: 0people: 1as markdown or json

Johannes Schindelin· Apr 5, 2006, 14:22 UTC · lore

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>
---
 Makefile |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
57918780ecdff0c767a22b7589ff1025de6cb40f
Show changes to Makefile +3 −1
diff --git a/Makefile b/Makefile
index 3596445..557d322 100644
--- a/Makefile
+++ b/Makefile
@@ -333,9 +333,11 @@ 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
 
-- 
1.3.0.rc2.g4a16-dirty

← back to recent threads