From patchwork Wed Jan 13 08:48:55 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v2,4/4] use pkg-config for libcurl whenever available Date: Tue, 12 Jan 2010 22:48:55 -0000 From: Paolo Bonzini X-Patchwork-Id: 42793 Message-Id: <1263372535-20535-5-git-send-email-pbonzini@redhat.com> To: qemu-devel@nongnu.org Signed-off-by: Paolo Bonzini --- configure | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 2553724..b3d4640 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 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"