| From 2629328b39ae117876f4854409c2231220a30b9c Mon Sep 17 00:00:00 2001 |
| From: Alex Kiernan <alex.kiernan@gmail.com> |
| Date: Thu, 5 Sep 2019 13:22:15 +0100 |
| Subject: [PATCH 2/2] 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 <alex.kiernan@gmail.com> |
| Upstream-Status: Submitted [https://github.com/ostreedev/ostree/pull/1912] |
| --- |
| 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 76f39cad4b74..7b53cb148960 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 069bab01752e..ffc67980d507 100644 |
| --- a/configure.ac |
| +++ b/configure.ac |
| @@ -192,6 +192,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])] |
| ) |
| -- |
| 2.17.1 |
| |