From patchwork Thu Jun 9 21:54:29 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 99816 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 16413B6FA3 for ; Fri, 10 Jun 2011 08:01:13 +1000 (EST) Received: from localhost ([::1]:40945 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QUnHp-0007iR-3O for incoming@patchwork.ozlabs.org; Thu, 09 Jun 2011 18:01:09 -0400 Received: from eggs.gnu.org ([140.186.70.92]:40407) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QUnBS-0006wu-N5 for qemu-devel@nongnu.org; Thu, 09 Jun 2011 17:54:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QUnBQ-0001r0-Kr for qemu-devel@nongnu.org; Thu, 09 Jun 2011 17:54:34 -0400 Received: from mnementh.archaic.org.uk ([81.2.115.146]:57730) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QUnBQ-0001qh-9q; Thu, 09 Jun 2011 17:54:32 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1QUnBN-0007f1-D2; Thu, 09 Jun 2011 22:54:29 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 9 Jun 2011 22:54:29 +0100 Message-Id: <1307656469-29424-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 81.2.115.146 Cc: qemu-trivial@nongnu.org, patches@linaro.org Subject: [Qemu-devel] [PATCH] configure: Detect and don't try to use older libcurl X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Older versions of libcurl don't have some of the features we try to use, in particular curl_multi_setopt(). Check for this in the 'is libcurl available?' configure test so we disable curl support if the library is too old. Signed-off-by: Peter Maydell --- configure | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure b/configure index d38b952..03d693a 100755 --- a/configure +++ b/configure @@ -1709,7 +1709,7 @@ fi if test "$curl" != "no" ; then cat > $TMPC << EOF #include -int main(void) { return curl_easy_init(); } +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`