aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2020-11-17 12:38:28 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2021-01-02 21:03:37 +0100
commit8e4e2b551d6d526c6f949f01e2a5e15df7feee6d (patch)
treee899a86afd1a057992f0ee1ed86913c9e921afde /configure
parent8c6d4ff404ba387a36ebf5f6f66364a3c5b4ef2e (diff)
downloadqemu-8e4e2b551d6d526c6f949f01e2a5e15df7feee6d.zip
qemu-8e4e2b551d6d526c6f949f01e2a5e15df7feee6d.tar.gz
qemu-8e4e2b551d6d526c6f949f01e2a5e15df7feee6d.tar.bz2
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é <berrange@redhat.com> Reviewed-by: Daniel Berrangé <berrange@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure9
1 files changed, 2 insertions, 7 deletions
diff --git a/configure b/configure
index 29d2b1e..6174566 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 <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)
if compile_prog "$curl_cflags" "$curl_libs" ; then
curl=yes
else