"Tom G. Christensen" <t...@statsbiblioteket.dk> writes: > diff --git a/Makefile b/Makefile > index c44eb3a..69a2ce3 100644 > --- a/Makefile > +++ b/Makefile > @@ -1035,13 +1035,13 @@ 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) > + curl_check := $(shell (echo 070908; curl-config --vernum | sed -e > '/^70[B-C]/ s/^7/07/') 2>/dev/null | sort -r | sed -ne 2p) > ifeq "$(curl_check)" "070908" > ifndef NO_EXPAT > PROGRAM_OBJS += http-push.o > endif > endif > - curl_check := $(shell (echo 072200; curl-config --vernum) 2>/dev/null | > sort -r | sed -ne 2p) > + curl_check := $(shell (echo 072200; curl-config --vernum | sed -e > '/^70[B-C]/ s/^7/07/') 2>/dev/null | sort -r | sed -ne 2p) > ifeq "$(curl_check)" "072200" > USE_CURL_FOR_IMAP_SEND = YesPlease > endif
Thanks, will apply but with sed part tweaked to '/^70[BC]/s/^/0/' instead. The existing tests that copied and pasted are bad enough. Can we consolidate them into some helper or a shorter idiom that lets us more easily ask "Do we have cURL version X or higher?" -- 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
