aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2011-06-09 22:54:29 +0100
committerEdgar E. Iglesias <edgar.iglesias@gmail.com>2011-06-13 21:16:27 +0200
commit0b862cedf36d927818c50584ddd611b0370673df (patch)
treeff33a8161054fc58a50bef099b8e666f3622e088
parent5f04e36882ab958b5a2e5f5153609921d03dd7d5 (diff)
configure: Detect and don't try to use older libcurl
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> Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index 663b557ad0..c931ae860a 100755
--- a/configure
+++ b/configure
@@ -1710,7 +1710,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`