Remove enable-network-backend flag from configure

The curl dependency is not optional any more.

diff --git a/snf-image-host/Makefile.am b/snf-image-host/Makefile.am
index 8a26b46..ab621f5 100644 (file)
--- a/snf-image-host/Makefile.am
+++ b/snf-image-host/Makefile.am
@@ -1,9 +1,3 @@
-if NETWORKIMGSUPPORT
-network_backend_support=yes
-else
-network_backend_support=no
-endif
-
 osname=$(PACKAGE)
 osdir=$(OS_DIR)/$(osname)
 defaultdir=$(DEFAULT_DIR)
@@ -40,9 +34,7 @@ edit = sed \
           -e 's|@QEMU_IMG[@]|$(QEMU_IMG)|g' \
           -e 's|@INSTALL_MBR[@]|$(INSTALL_MBR)|g' \
           -e 's|@PROGRESS_MONITOR[@]|$(PROGRESS_MONITOR)|g' \
-          -e 's|@UNATTEND[@]|$(UNATTEND)|g' \
-          -e 's|@progress_monitor_support[@]|$(progress_monitor_support)|g' \
-          -e 's|@network_backend_support[@]|$(network_backend_support)|g'
+          -e 's|@UNATTEND[@]|$(UNATTEND)|g'
 
 %:%.in Makefile
        rm -f $@ $@.tmp

diff --git a/snf-image-host/common.sh.in b/snf-image-host/common.sh.in
index 2b327e6..768a448 100644 (file)
--- a/snf-image-host/common.sh.in
+++ b/snf-image-host/common.sh.in
@@ -29,8 +29,6 @@ CURL="curl"
 # `create' will overwrite this
 MONITOR_FD="2"
 
-network_backend_support="@network_backend_support@"
-
 MSG_TYPE_ERROR="image-error"
 MSG_TYPE_INFO="image-info"
 

diff --git a/snf-image-host/configure.ac b/snf-image-host/configure.ac
index 37f793e..8fe8459 100644 (file)
--- a/snf-image-host/configure.ac
+++ b/snf-image-host/configure.ac
@@ -12,9 +12,6 @@ AC_ARG_ENABLE([network_backend],
     [enable support for network-hosted images
     (this depends on cURL)])
 )
-AS_IF([test "x$enable_network_backend" = "xyes"],,
-    [AC_MSG_NOTICE(network backend support not enabled)])
-AM_CONDITIONAL(NETWORKIMGSUPPORT, [test "x$enable_network_backend" = "xyes"])
 
 # --with-progress-monitor
 AC_ARG_WITH([progress-monitor],
@@ -135,13 +132,9 @@ if test -z "$TIMEOUT" ; then
   AC_MSG_ERROR([timeout not found in $PATH:/usr/sbin:/sbin])
 fi
 
-if test "x$enable_network_backend" = "xyes" ; then
-  AC_PATH_PROG(CURL, [curl], [], [$PATH:/usr/sbin:/sbin])
-    if test -z "$CURL" ; then
-      AC_MSG_ERROR([curl is needed for network backend support but was not \
-      found in $PATH:/usr/sbin:/sbin]
-      [To disable network backend support ommit --enable-network-backend])
-    fi
+AC_PATH_PROG(CURL, [curl], [], [$PATH:/usr/sbin:/sbin])
+if test -z "$CURL" ; then
+  AC_MSG_ERROR([curl not found in $PATH:/usr/sbin:/sbin])
 fi
 
 AC_CONFIG_FILES([