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: 1794 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.45.109) by localhost6.localdomain6 with IMAP4-SSL; 10 Jun 2011 20:11:47 -0000 Delivered-To: patches@linaro.org Received: by 10.52.181.10 with SMTP id ds10cs276538vdc; Thu, 9 Jun 2011 14:54:32 -0700 (PDT) Received: by 10.227.55.73 with SMTP id t9mr1341307wbg.79.1307656471728; Thu, 09 Jun 2011 14:54:31 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk [81.2.115.146]) by mx.google.com with ESMTPS id d17si5169990wbh.8.2011.06.09.14.54.31 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 09 Jun 2011 14:54:31 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) client-ip=81.2.115.146; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) smtp.mail=pm215@archaic.org.uk 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 Cc: patches@linaro.org, qemu-trivial@nongnu.org Subject: [PATCH] configure: Detect and don't try to use older libcurl 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 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`