From ac4e3ab3e6e01b5d46fc16f86a0f0e0285f90d05 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 21 Oct 2019 21:45:20 +0000 Subject: [PATCH] build-sys: Cleanup handling for trivial-httpd-cmdline This way it's clearer this bit is only about the CLI entrypoint also living in `ostree trivial-httpd`, not the underlying `ostree-trivial-httpd` binary that's separate now. Delete the automake conditional for this, and make the manpage conditional use `if USE_LIBSOUP` the same way the C build does. Suggested-by: Jonathan Lebon --- Makefile-man.am | 2 +- configure.ac | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile-man.am b/Makefile-man.am index c27a9a55..bc58103b 100644 --- a/Makefile-man.am +++ b/Makefile-man.am @@ -34,7 +34,7 @@ ostree-init.1 ostree-log.1 ostree-ls.1 ostree-prune.1 ostree-pull-local.1 \ ostree-pull.1 ostree-refs.1 ostree-remote.1 ostree-reset.1 \ ostree-rev-parse.1 ostree-show.1 ostree-summary.1 \ ostree-static-delta.1 -if BUILDOPT_TRIVIAL_HTTPD +if USE_LIBSOUP man1_files += ostree-trivial-httpd.1 else # We still want to distribute the source, even if we are not building it diff --git a/configure.ac b/configure.ac index 6861afb8..53994be1 100644 --- a/configure.ac +++ b/configure.ac @@ -194,8 +194,7 @@ AC_ARG_ENABLE(trivial-httpd-cmdline, [AS_HELP_STRING([--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) -AM_COND_IF(BUILDOPT_TRIVIAL_HTTPD, +AS_IF([test x$enable_trivial_httpd_cmdline = xyes], [AC_DEFINE([BUILDOPT_ENABLE_TRIVIAL_HTTPD_CMDLINE], 1, [Define if we are enabling ostree trivial-httpd entrypoint])] )