diff options
| author |  Nick Hengeveld <nickh@reactrix.com> | 2005-11-18 17:08:36 -0800 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2005-11-19 20:17:25 -0800 |
| commit | 0890098780f295f2a58658d1f6b6627e40426c72 (patch) | |
| tree | 58111a62fae0969210ab8237755a47f32cb7c5e4 | |
| parent | http.c: reorder to avoid compilation failure. (diff) | |
| download | tgif-0890098780f295f2a58658d1f6b6627e40426c72.tar.xz | |
Decide whether to build http-push in the Makefile
The decision about whether to build http-push or not belongs in the
Makefile. This follows Junio's suggestion to determine whether curl
is new enough to support http-push.
Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | http-push.c | 9 |
2 files changed, 6 insertions, 12 deletions
@@ -242,9 +242,12 @@ ifndef NO_CURL CURL_LIBCURL = -lcurl endif PROGRAMS += git-http-fetch$X - ifndef NO_EXPAT - EXPAT_LIBEXPAT = -lexpat - PROGRAMS += git-http-push$X + 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 endif diff --git a/http-push.c b/http-push.c index f3c92c971e..76c788673e 100644 --- a/http-push.c +++ b/http-push.c @@ -6,8 +6,6 @@ #include "blob.h" #include "http.h" -#ifdef USE_CURL_MULTI - #include <expat.h> static const char http_push_usage[] = @@ -1426,10 +1424,3 @@ int main(int argc, char **argv) return rc; } -#else /* ifdef USE_CURL_MULTI */ -int main(int argc, char **argv) -{ - fprintf(stderr, "http-push requires curl 7.9.8 or higher.\n"); - return 1; -} -#endif |