mirror of
https://github.com/ostreedev/ostree.git
synced 2024-12-22 17:35:55 +03:00
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>
This commit is contained in:
parent
82699a67db
commit
83d44ac20a
@ -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
|
||||
|
@ -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])]
|
||||
)
|
||||
|
Loading…
Reference in New Issue
Block a user