qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH] configure: Detect and don't try to use older libcurl
@ 2011-06-09 21:54 Peter Maydell
  2011-06-13 19:24 ` Edgar E. Iglesias
  0 siblings, 1 reply; 2+ messages in thread
From: Peter Maydell @ 2011-06-09 21:54 UTC (permalink / raw)
  To: qemu-devel; +Cc: qemu-trivial, patches

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 <peter.maydell@linaro.org>
---
 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 <curl/curl.h>
-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`
-- 
1.7.1

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [Qemu-devel] [PATCH] configure: Detect and don't try to use older libcurl
  2011-06-09 21:54 [Qemu-devel] [PATCH] configure: Detect and don't try to use older libcurl Peter Maydell
@ 2011-06-13 19:24 ` Edgar E. Iglesias
  0 siblings, 0 replies; 2+ messages in thread
From: Edgar E. Iglesias @ 2011-06-13 19:24 UTC (permalink / raw)
  To: Peter Maydell; +Cc: qemu-trivial, qemu-devel, patches

On Thu, Jun 09, 2011 at 10:54:29PM +0100, Peter Maydell wrote:
> 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.

Applied, thanks.


> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>  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 <curl/curl.h>
> -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`
> -- 
> 1.7.1
> 
> 

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2011-06-13 19:24 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-09 21:54 [Qemu-devel] [PATCH] configure: Detect and don't try to use older libcurl Peter Maydell
2011-06-13 19:24 ` Edgar E. Iglesias

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).