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>

diff --git a/Makefile b/Makefile
index 285b3ed16ed41c500890684e8fe4f40741c5a5bf..0efb0b65654de91e2e2308343b4c9d4e58711d88 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -242,9 +242,12 @@ ifndef NO_CURL
                CURL_LIBCURL = -lcurl
        endif
        PROGRAMS += git-http-fetch$X
                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
 
        endif
 endif
 

diff --git a/http-push.c b/http-push.c
index f3c92c971e65e9df72fafdab52b4935866a0a794..76c788673e0a02c723d99976d3e605531341c7a9 100644 (file)
--- a/http-push.c
+++ b/http-push.c
@@ -6,8 +6,6 @@
 #include "blob.h"
 #include "http.h"
 
 #include "blob.h"
 #include "http.h"
 

-#ifdef USE_CURL_MULTI
-

 #include <expat.h>
 
 static const char http_push_usage[] =
 #include <expat.h>
 
 static const char http_push_usage[] =


@@ -1426,10 +1424,3 @@ int main(int argc, char **argv)
 
        return rc;
 }
 
        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