Merge branch 'nh/http' into next

* nh/http: Fix compile with expat, but an old curl version
git-mirror · Apr 5, 2006 · 806d097 · 806d097
2 parents d6102b5 + 459a21b
commit 806d097
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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