On Mon, Apr 28, 2014 at 11:01 AM, Erik Faye-Lund <kusmab...@gmail.com> wrote:
> On Mon, Apr 28, 2014 at 10:48 AM, Erik Faye-Lund <kusmab...@gmail.com> wrote:
>> So it seems that 08900987 ("Decide whether to build http-push in the
>> Makefile") makes a bad assumption about the availability of
>> curl-config on new libcurl installations; it's not present on "stock"
>> Windows builds.
>
> I wonder, though. That check is over 8 years old. Are that old systems
> (that haven't been upgraded) still able to build Git? Even my old
> RedHat 5 setup has curl 7.15.5...
>
> Perhaps the following is the right thing to do? If not, perhaps we
> could move this complication to configure.ac, which could get the
> version number from the header-file instead? That way, quirks only
> affect quirky systems...And here's a stab at that. Not really tested, as I don't have an affected system, so it's probably broken somehow ;) But if someone want's to pick it up, at least there's a starting-point. --- diff --git a/Makefile b/Makefile index 29a555d..b94f830 100644 --- a/Makefile +++ b/Makefile @@ -1133,11 +1133,8 @@ else REMOTE_CURL_NAMES = $(REMOTE_CURL_PRIMARY) $(REMOTE_CURL_ALIASES) PROGRAM_OBJS += http-fetch.o PROGRAMS += $(REMOTE_CURL_NAMES) - curl_check := $(shell (echo 070908; curl-config --vernum) 2>/dev/null | sort -r | sed -ne 2p) - ifeq "$(curl_check)" "070908" - ifndef NO_EXPAT - PROGRAM_OBJS += http-push.o - endif + ifndef NO_CAPABLE_CURL + PROGRAM_OBJS += http-push.o endif ifndef NO_EXPAT ifdef EXPATDIR diff --git a/configure.ac b/configure.ac index 2f43393..47991c0 100644 --- a/configure.ac +++ b/configure.ac @@ -513,6 +513,16 @@ AC_CHECK_LIB([curl], [curl_global_init], [NO_CURL=], [NO_CURL=YesPlease]) +AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([#include <curlver.h>], + [#if LIBCURL_VERSION_NUM < 0x070908 +#error version too old +#endif + ])], + [NO_CAPABLE_CURL=YesPlease], + [NO_CAPABLE_CURL=]) +GIT_CONF_SUBST([NO_CAPABLE_CURL]) + GIT_UNSTASH_FLAGS($CURLDIR) GIT_CONF_SUBST([NO_CURL]) -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
