From patchwork Wed Jan 13 08:52:56 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 42798 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6D9CA1007D4 for ; Wed, 13 Jan 2010 20:08:51 +1100 (EST) Received: from localhost ([127.0.0.1]:56371 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NUzC3-0003VK-0q for incoming@patchwork.ozlabs.org; Wed, 13 Jan 2010 04:07:11 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NUyyX-00072X-PJ for qemu-devel@nongnu.org; Wed, 13 Jan 2010 03:53:13 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NUyyS-00070A-VU for qemu-devel@nongnu.org; Wed, 13 Jan 2010 03:53:13 -0500 Received: from [199.232.76.173] (port=57724 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NUyyS-000701-Mg for qemu-devel@nongnu.org; Wed, 13 Jan 2010 03:53:08 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59143) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NUyyS-0005AQ-4A for qemu-devel@nongnu.org; Wed, 13 Jan 2010 03:53:08 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o0D8r4To012115 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 13 Jan 2010 03:53:04 -0500 Received: from localhost.localdomain (vpn2-11-187.ams2.redhat.com [10.36.11.187]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o0D8qvrb030066 for ; Wed, 13 Jan 2010 03:53:03 -0500 From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 13 Jan 2010 09:52:56 +0100 Message-Id: <1263372776-23753-5-git-send-email-pbonzini@redhat.com> In-Reply-To: <1263372776-23753-1-git-send-email-pbonzini@redhat.com> References: <1263372776-23753-1-git-send-email-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH v3 4/4] use pkg-config for libcurl whenever available X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@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"