From 967ea6692187e43487f939298eff1e8024399775 Mon Sep 17 00:00:00 2001
From: Alex Kiernan <alex.kiernan@gmail.com>
Date: Sat, 19 Oct 2019 22:20:27 +0100
Subject: [PATCH] Revert "Always enable trivial-httpd for tests"

This reverts commit 82699a67dbb6bfcc9452bb969e7872809232a84f.
---
 Makefile.am        | 1 -
 ci/build.sh        | 5 -----
 ci/travis-build.sh | 1 -
 3 files changed, 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 673dbf88..cd04a055 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,7 +39,6 @@ AM_DISTCHECK_CONFIGURE_FLAGS += \
 	--enable-gtk-doc \
 	--enable-man \
 	--disable-maintainer-mode \
-	--enable-trivial-httpd-cmdline \
 	$(NULL)
 
 GITIGNOREFILES = aclocal.m4 build-aux/ buildutil/*.m4 config.h.in gtk-doc.make
diff --git a/ci/build.sh b/ci/build.sh
index 806af050..09015074 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -22,11 +22,6 @@ case "${CONFIGOPTS:-}" in
         fi
         ;;
 esac
-# unless libsoup is disabled, enable trivial-httpd for the tests
-case "${CONFIGOPTS:-}" in
-    *--without-soup*) ;;
-    *) CONFIGOPTS="${CONFIGOPTS:-} --enable-trivial-httpd-cmdline" ;;
-esac
 
 # always fail on warnings; https://github.com/ostreedev/ostree/pull/971
 # NB: this disables the default set of flags from configure.ac
diff --git a/ci/travis-build.sh b/ci/travis-build.sh
index 7c85313a..3fd969bd 100755
--- a/ci/travis-build.sh
+++ b/ci/travis-build.sh
@@ -85,7 +85,6 @@ make="make -j${ci_parallel} V=1 VERBOSE=1"
 
 ../configure \
     --enable-always-build-tests \
-    --enable-trivial-httpd-cmdline \
     ${ci_configopts}
     "$@"