From 83d44ac20ae80d74e05d89744fd1fbd4f45b7fba Mon Sep 17 00:00:00 2001 From: Alex Kiernan Date: Thu, 5 Sep 2019 13:22:15 +0100 Subject: [PATCH] Gate ostree-trivial-httpd on BUILDOPT_TRIVIAL_HTTPD When building without --enable-trivial-httpd-cmdline, don't build or install the ostree-trivial-httpd binary. Signed-off-by: Alex Kiernan --- Makefile-ostree.am | 3 ++- configure.ac | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile-ostree.am b/Makefile-ostree.am index 76f39cad..7b53cb14 100644 --- a/Makefile-ostree.am +++ b/Makefile-ostree.am @@ -143,12 +143,13 @@ ostree_SOURCES += src/ostree/ot-builtin-pull.c endif if USE_LIBSOUP -# Eventually once we stop things from using this, we should support disabling this +if BUILDOPT_TRIVIAL_HTTPD ostree_SOURCES += src/ostree/ot-builtin-trivial-httpd.c pkglibexec_PROGRAMS += ostree-trivial-httpd ostree_trivial_httpd_SOURCES = src/ostree/ostree-trivial-httpd.c ostree_trivial_httpd_CFLAGS = $(ostree_bin_shared_cflags) $(OT_INTERNAL_SOUP_CFLAGS) ostree_trivial_httpd_LDADD = $(ostree_bin_shared_ldadd) $(OT_INTERNAL_SOUP_LIBS) +endif if !USE_CURL # This is necessary for the cookie jar bits diff --git a/configure.ac b/configure.ac index 6861afb8..e009d6b2 100644 --- a/configure.ac +++ b/configure.ac @@ -195,6 +195,9 @@ AC_ARG_ENABLE(trivial-httpd-cmdline, [Continue to support "ostree trivial-httpd" [default=no]])],, enable_trivial_httpd_cmdline=no) AM_CONDITIONAL(BUILDOPT_TRIVIAL_HTTPD, test x$enable_trivial_httpd_cmdline = xyes) +AS_IF([test x$with_soup = xno && test x$enable_trivial_httpd_cmdline = xyes], [ + AC_MSG_ERROR([trivial-httpd enabled, but libsoup is not; libsoup is needed for trivial-httpd]) +]) AM_COND_IF(BUILDOPT_TRIVIAL_HTTPD, [AC_DEFINE([BUILDOPT_ENABLE_TRIVIAL_HTTPD_CMDLINE], 1, [Define if we are enabling ostree trivial-httpd entrypoint])] )