From 353fb175c628e0d1d767a6ae323a495afdc03fb2 Mon Sep 17 00:00:00 2001 From: Anton Gerasimov Date: Mon, 8 Jan 2018 14:53:46 +0100 Subject: [PATCH] build-sys: Allow building with curl, but without libsoup Some people (particularly embedded) may find it simpler to drop libsoup from the build dependency side, but still use libcurl. Note though this currently neuters almost all of the tests. Signed-off-by: Anton Gerasimov Closes: #1397 Approved by: cgwalters --- Makefile-tests.am | 8 ++++++++ configure.ac | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Makefile-tests.am b/Makefile-tests.am index 25a8d08b..9198eb31 100644 --- a/Makefile-tests.am +++ b/Makefile-tests.am @@ -381,6 +381,14 @@ dist_test_scripts += $(_installed_or_uninstalled_test_scripts) test_programs += $(_installed_or_uninstalled_test_programs) endif +if !USE_LIBSOUP +no-soup-for-you-warning: + @echo "WARNING: $(PACKAGE) was built without libsoup, which is currently" 1>&2 + @echo "WARNING: required for many unit tests." 1>&2 + sleep 10 +check: no-soup-for-you-warning +endif + # Unfortunately the glib test data APIs don't actually handle # non-recursive Automake, so we change our code to canonically look # for tests/ which is just a symlink when installed. diff --git a/configure.ac b/configure.ac index fa436ea6..e26c903c 100644 --- a/configure.ac +++ b/configure.ac @@ -197,7 +197,7 @@ AM_COND_IF(BUILDOPT_TRIVIAL_HTTPD, ) AS_IF([test x$with_curl = xyes && test x$with_soup = xno], [ - AC_MSG_ERROR([Curl enabled, but libsoup is not; libsoup is needed for tests]) + AC_MSG_WARN([Curl enabled, but libsoup is not; libsoup is needed for tests (make check, etc.)]) ]) AM_CONDITIONAL(USE_CURL_OR_SOUP, test x$with_curl != xno || test x$with_soup != xno) AS_IF([test x$with_curl != xno || test x$with_soup != xno],