From: Steve Brokenshire Date: Sat, 13 Jan 2018 00:09:02 +0000 (+0000) Subject: configure: curl version needed is now 7.54.1 X-Git-Tag: release-0.22~4 X-Git-Url: http://Server1/repobrowser/?a=commitdiff_plain;h=1fb97c13f1de4f8688129e6828bb1c6379bf636b;p=xestiaab%2F.git configure: curl version needed is now 7.54.1 --- diff --git a/source/configure b/source/configure index 3bff162..89524da 100755 --- a/source/configure +++ b/source/configure @@ -4630,12 +4630,12 @@ if test -n "$CURL_CFLAGS"; then pkg_cv_CURL_CFLAGS="$CURL_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.52.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libcurl >= 7.52.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.54.1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libcurl >= 7.54.1") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_CURL_CFLAGS=`$PKG_CONFIG --cflags "libcurl >= 7.52.0" 2>/dev/null` + pkg_cv_CURL_CFLAGS=`$PKG_CONFIG --cflags "libcurl >= 7.54.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -4647,12 +4647,12 @@ if test -n "$CURL_LIBS"; then pkg_cv_CURL_LIBS="$CURL_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.52.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libcurl >= 7.52.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.54.1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libcurl >= 7.54.1") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_CURL_LIBS=`$PKG_CONFIG --libs "libcurl >= 7.52.0" 2>/dev/null` + pkg_cv_CURL_LIBS=`$PKG_CONFIG --libs "libcurl >= 7.54.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -4673,14 +4673,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - CURL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcurl >= 7.52.0" 2>&1` + CURL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcurl >= 7.54.1" 2>&1` else - CURL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcurl >= 7.52.0" 2>&1` + CURL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcurl >= 7.54.1" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$CURL_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (libcurl >= 7.52.0) were not met: + as_fn_error $? "Package requirements (libcurl >= 7.54.1) were not met: $CURL_PKG_ERRORS diff --git a/source/configure.ac b/source/configure.ac index 4b88f57..5834f8b 100644 --- a/source/configure.ac +++ b/source/configure.ac @@ -97,7 +97,7 @@ AC_LANG_POP([C++]) # curl Library -PKG_CHECK_MODULES([CURL], [libcurl >= 7.52.0]) +PKG_CHECK_MODULES([CURL], [libcurl >= 7.54.1]) AC_CHECK_LIB([curl], [main], [], [echo "The cURL library must be installed on your system. Please check that this library is installed properly before