diff options
| author | Alex Kiernan <alex.kiernan@gmail.com> | 2019-09-05 13:22:15 +0100 |
|---|---|---|
| committer | Alex Kiernan <alex.kiernan@gmail.com> | 2019-10-09 06:04:54 +0100 |
| commit | 83d44ac20ae80d74e05d89744fd1fbd4f45b7fba (patch) | |
| tree | 30533d6298da2cc0d7b66282c18163583d7651a8 /Makefile-ostree.am | |
| parent | 82699a67dbb6bfcc9452bb969e7872809232a84f (diff) | |
| download | ostree-83d44ac20ae80d74e05d89744fd1fbd4f45b7fba.tar.gz | |
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>
Diffstat (limited to 'Makefile-ostree.am')
| -rw-r--r-- | Makefile-ostree.am | 3 |
1 files changed, 2 insertions, 1 deletions
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 |