From: Erik Faye-Lund Date: Mon, 28 Apr 2014 13:12:13 GMT Subject: Re: git version 1.9.0 missing git-http-push? Message-ID: In-Reply-To: On Mon, Apr 28, 2014 at 11:01 AM, Erik Faye-Lund wrote: > On Mon, Apr 28, 2014 at 10:48 AM, Erik Faye-Lund 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... > > (white-space damaged, I'll post a proper patch if there's some agreement) > --- > > diff --git a/Makefile b/Makefile > index 29a555d..6da72e7 100644 > --- a/Makefile > +++ b/Makefile > @@ -1133,13 +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 > - endif > ifndef NO_EXPAT > + PROGRAM_OBJS += http-push.o > ifdef EXPATDIR > BASIC_CFLAGS += -I$(EXPATDIR)/include > EXPAT_LIBEXPAT = -L$(EXPATDIR)/$(lib) > $(CC_LD_DYNPATH)$(EXPATDIR)/$(lib) -lexpat I've built an installer with this patch applied, and it seems to do the trick: https://dl.dropboxusercontent.com/u/1737924/Git-1.9.2-http-push.exe -- -- *** Please reply-to-all at all times *** *** (do not pretend to know who is subscribed and who is not) *** *** Please avoid top-posting. *** The msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free. You received this message because you are subscribed to the Google Groups "msysGit" group. To post to this group, send email to msysgit@googlegroups.com To unsubscribe from this group, send email to msysgit+unsubscribe@googlegroups.com For more options, and view previous threads, visit this group at http://groups.google.com/group/msysgit?hl=en_US?hl=en --- You received this message because you are subscribed to the Google Groups "msysGit" group. To unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com. For more options, visit https://groups.google.com/d/optout.