Re: [PATCH 02/18] curl: remove compatibility code, require 7.29.0

[Daniel P . Berrangé]

On Thu, Dec 17, 2020 at 10:40:28AM +0100, Paolo Bonzini wrote:
> cURL 7.16.0 was released in October 2006.  Just remove code that is
> in all likelihood not being used anywhere, and require the oldest version
> found in currently supported distros, which is 7.29.0 from CentOS 7.
> 
> pkg-config is enough for QEMU, since it does not need extra information
> such as the path for certicate authorities.  All supported platforms
> today will all have pkg-config for curl, so we can drop curl-config.
> 
> Suggested-by: Daniel Berrangé <berrange@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  block/curl.c | 28 ----------------------------
>  configure    |  9 ++-------
>  2 files changed, 2 insertions(+), 35 deletions(-)
> 

> diff --git a/configure b/configure
> index 42b39544d4..c0a3e1556b 100755
> --- a/configure
> +++ b/configure
> @@ -3428,17 +3428,12 @@ done
>  ##########################################
>  # curl probe
>  if test "$curl" != "no" ; then
> -  if $pkg_config libcurl --exists; then
> -    curlconfig="$pkg_config libcurl"
> -  else
> -    curlconfig=curl-config
> -  fi
>    cat > $TMPC << EOF
>  #include <curl/curl.h>
>  int main(void) { curl_easy_init(); curl_multi_setopt(0, 0, 0); return 0; }
>  EOF
> -  curl_cflags=$($curlconfig --cflags 2>/dev/null)
> -  curl_libs=$($curlconfig --libs 2>/dev/null)
> +  curl_cflags=$($pkg_config libcurl --cflags 2>/dev/null)
> +  curl_libs=$($pkg_config libcurl --libs 2>/dev/null)

Should really be  libcurl >= 7.29.0, but since you're removing this in
the next patch, and have the right version check in meson, I'm ambivalent
here.

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>



Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|