aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2010-01-13 09:52:56 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2010-01-13 17:14:14 -0600
commit4e2b0658f60081fe7a19f4c71a6f5fd506c9eeb9 (patch)
tree947178458da36a3adacfccd9e3d2f6a888c52051
parent9316f80399cab827e6a3e8c651c1be7fa8ba6008 (diff)
downloadqemu-4e2b0658f60081fe7a19f4c71a6f5fd506c9eeb9.zip
qemu-4e2b0658f60081fe7a19f4c71a6f5fd506c9eeb9.tar.gz
qemu-4e2b0658f60081fe7a19f4c71a6f5fd506c9eeb9.tar.bz2
use pkg-config for libcurl whenever available
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rwxr-xr-xconfigure10
1 files changed, 8 insertions, 2 deletions
diff --git a/configure b/configure
index f0bd38b..5631bbb 100755
--- a/configure
+++ b/configure
@@ -1309,13 +1309,19 @@ fi
##########################################
# curl probe
+if $pkgconfig libcurl --modversion >/dev/null 2>&1; then
+ curlconfig="$pkgconfig libcurl"
+else
+ curlconfig=curl-config
+fi
+
if test "$curl" != "no" ; then
cat > $TMPC << EOF
#include <curl/curl.h>
int main(void) { return curl_easy_init(); }
EOF
- curl_cflags=`curl-config --cflags 2>/dev/null`
- curl_libs=`curl-config --libs 2>/dev/null`
+ curl_cflags=`$curlconfig --cflags 2>/dev/null`
+ curl_libs=`$curlconfig --libs 2>/dev/null`
if compile_prog "$curl_cflags" "$curl_libs" ; then
curl=yes
libs_tools="$curl_libs $libs_tools"