From 8e4e2b551d6d526c6f949f01e2a5e15df7feee6d Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 17 Nov 2020 12:38:28 +0100 Subject: curl: remove compatibility code, require 7.29.0 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é Reviewed-by: Daniel Berrangé Signed-off-by: Paolo Bonzini --- configure | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 29d2b1ebe6..617456676d 100755 --- a/configure +++ b/configure @@ -3427,17 +3427,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 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) if compile_prog "$curl_cflags" "$curl_libs" ; then curl=yes else -- cgit v1.2.3-55-g7522