From f1f199578e0364e6627002fa8cb24605d9485ed4 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Wed, 26 Jul 2017 15:51:57 -0400
Subject: [PATCH] ci: Enable libcurl by default on Fedora

The insttest fell over since its build used libsoup, but that just dropped out
of FAH.

Closes: #1030
Approved by: jlebon
---
 .papr.yml   | 5 +----
 ci/build.sh | 7 +++++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.papr.yml b/.papr.yml
index ea378c98..0a4e04ee 100644
--- a/.papr.yml
+++ b/.papr.yml
@@ -12,8 +12,6 @@ packages:
   - git
 
 env:
-    # At some point soon will encourage distros to use libcurl
-    CONFIGOPTS: "--with-curl --with-openssl"
     # Enable all the sanitizers for this primary build.
     # We only use -Werror=maybe-uninitialized here with a "fixed" toolchain
     CFLAGS: '-fsanitize=undefined -fsanitize-undefined-trap-on-error -fsanitize=address -O2 -Wp,-D_FORTIFY_SOURCE=2'
@@ -85,7 +83,7 @@ required: true
 context: f26-libsoup
 
 env:
-  CONFIGOPTS: "--without-curl --without-openssl"
+  CONFIGOPTS: "--without-curl --without-openssl --with-libsoup"
 
 tests:
   - ci/build-check.sh
@@ -98,7 +96,6 @@ required: true
 context: f26-introspection-tests
 
 env:
-    CONFIGOPTS: "--with-curl --with-openssl"
     # ASAN conflicts with introspection testing;
     # See https://github.com/ostreedev/ostree/issues/1014
     INSTALLED_TESTS_PATTERN: "libostree/test-sizes.js libostree/test-sysroot.js libostree/test-core.js"
diff --git a/ci/build.sh b/ci/build.sh
index 2d7eb61e..22071764 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -21,4 +21,11 @@ DETECTED_CONFIGOPTS=
 if test -x /usr/bin/gnome-desktop-testing-runner; then
     DETECTED_CONFIGOPTS="${DETECTED_CONFIGOPTS} --enable-installed-tests=exclusive"
 fi
+# Default libcurl on by default in fedora unless libsoup is enabled
+if sh -c '. /etc/os-release; test "${ID}" = fedora'; then
+    case "${CONFIGOPTS:-}" in
+        *--with-soup*) ;;
+        *) CONFIGOPTS="${CONFIGOPTS:-} --with-curl"
+    esac
+fi
 build --enable-gtk-doc ${DETECTED_CONFIGOPTS} ${CONFIGOPTS:-}