From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MbGkH-0007y0-US
	for qemu-devel@nongnu.org; Wed, 12 Aug 2009 12:32:13 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MbGkD-0007s1-9X
	for qemu-devel@nongnu.org; Wed, 12 Aug 2009 12:32:13 -0400
Received: from [199.232.76.173] (port=39156 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MbGkD-0007rr-1i
	for qemu-devel@nongnu.org; Wed, 12 Aug 2009 12:32:09 -0400
Received: from mx2.redhat.com ([66.187.237.31]:55706)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <quintela@redhat.com>) id 1MbGkC-0004IT-BL
	for qemu-devel@nongnu.org; Wed, 12 Aug 2009 12:32:08 -0400
Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26])
	by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n7CGW7A6018268
	for <qemu-devel@nongnu.org>; Wed, 12 Aug 2009 12:32:07 -0400
From: Juan Quintela <quintela@redhat.com>
Date: Wed, 12 Aug 2009 18:29:47 +0200
Message-Id: <71025e96da7eb85957e11d9cf4530c1ee81577d5.1250093910.git.quintela@redhat.com>
In-Reply-To: <cover.1250093910.git.quintela@redhat.com>
References: <cover.1250093910.git.quintela@redhat.com>
Subject: [Qemu-devel] [PATCH 10/20] Add curl to new feature convencion
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org


Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 configure |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index 1efe412..b4a6669 100755
--- a/configure
+++ b/configure
@@ -180,6 +180,7 @@ esac
 # --enable-foo that exits if feature is not found

 brlapi=""
+curl=""
 curses=""
 vde=""
 vnc_tls=""
@@ -210,7 +211,6 @@ bsd_user="no"
 guest_base=""
 build_docs="yes"
 uname_release=""
-curl="yes"
 pthread="yes"
 aio="yes"
 io_thread="no"
@@ -523,6 +523,8 @@ for opt do
   ;;
   --disable-curl) curl="no"
   ;;
+  --enable-curl) curl="yes"
+  ;;
   --disable-nptl) nptl="no"
   ;;
   --enable-mixemu) mixemu="yes"
@@ -652,6 +654,7 @@ echo "  --enable-vnc-sasl        enable SASL encryption for VNC server"
 echo "  --disable-curses         disable curses output"
 echo "  --enable-curses          enable curses output"
 echo "  --disable-curl           disable curl connectivity"
+echo "  --enable-curl            enable curl connectivity"
 echo "  --disable-bluez          disable bluez stack connectivity"
 echo "  --disable-kvm            disable KVM acceleration support"
 echo "  --disable-nptl           disable usermode NPTL support"
@@ -1162,8 +1165,7 @@ fi
 ##########################################
 # curl probe

-if test "$curl" = "yes" ; then
-  curl=no
+if test "$curl" != "no" ; then
   cat > $TMPC << EOF
 #include <curl/curl.h>
 int main(void) { return curl_easy_init(); }
@@ -1174,6 +1176,11 @@ EOF
     curl=yes
     libs_tools="$curl_libs $libs_tools"
     libs_softmmu="$curl_libs $libs_softmmu"
+  else
+    if test "$curl" = "yes" ; then
+      feature_not_found "curl"
+    fi
+    curl=no
   fi
 fi # test "$curl"

-- 
1.6.2.5