From b5528bb8de4c6d762b688a3bb7d67f2308afeb8a Mon Sep 17 00:00:00 2001 From: Charles Peterson Date: Thu, 10 May 2018 15:07:31 -0300 Subject: [PATCH] fix when multiple lines for curl version Issue #1771 --- CHANGES | 2 ++ build/curl.m4 | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index c3bc7fcc..87b568a2 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,8 @@ v3.0.3 - YYYY-MMM-DD (to be released) ------------------------------------- + - Fix when multiple lines for curl version. + [Issue #1771 - @Artistan] - Checks if response body inspection is enabled before process it [Issue #1643 - @zoltan-fedor, @dennus, @defanator, @zimmerle] - processContentOffset Cleanup diff --git a/build/curl.m4 b/build/curl.m4 index 7397a221..66126ece 100644 --- a/build/curl.m4 +++ b/build/curl.m4 @@ -53,7 +53,7 @@ if test -n "${curl_path}"; then CURL_CONFIG="${curl_path}/${CURL_CONFIG}" fi AC_MSG_RESULT([${CURL_CONFIG}]) - CURL_VERSION=`${CURL_CONFIG} --version | sed 's/^[[^0-9]][[^[:space:]]][[^[:space:]]]*[[[:space:]]]*//'` + CURL_VERSION=`${CURL_CONFIG} --version | sed 's/^[[^0-9]][[^[:space:]]][[^[:space:]]]*[[[:space:]]]*//' | tr '\r\n' ' '` if test ! -z "${CURL_VERSION}"; then AC_MSG_NOTICE(curl VERSION: $CURL_VERSION); fi CURL_CFLAGS="`${CURL_CONFIG} --cflags`" if test ! -z "${CURL_CFLAGS}"; then AC_MSG_NOTICE(curl CFLAGS: $CURL_CFLAGS); fi