Patchwork [10/20] Add curl to new feature convencion

login
register
mail settings
Submitter Juan Quintela
Date Aug. 12, 2009, 4:29 p.m.
Message ID <71025e96da7eb85957e11d9cf4530c1ee81577d5.1250093910.git.quintela@redhat.com>
Download mbox | patch
Permalink /patch/31212/
State Superseded
Headers show

Comments

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

Patch

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"