packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <jonathan@jlebon.com>
This commit is contained in:
Colin Walters 2019-10-21 21:45:20 +00:00
parent f333ae74f4
commit ac4e3ab3e6
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile-man.am
View File

@ -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-pull.1 ostree-refs.1 ostree-remote.1 ostree-reset.1 \
ostree-rev-parse.1 ostree-show.1 ostree-summary.1 \ ostree-rev-parse.1 ostree-show.1 ostree-summary.1 \
ostree-static-delta.1 ostree-static-delta.1
if BUILDOPT_TRIVIAL_HTTPD if USE_LIBSOUP
man1_files += ostree-trivial-httpd.1 man1_files += ostree-trivial-httpd.1
else else
# We still want to distribute the source, even if we are not building it # We still want to distribute the source, even if we are not building it

3
configure.ac
View File

@ -194,8 +194,7 @@ AC_ARG_ENABLE(trivial-httpd-cmdline,
[AS_HELP_STRING([--enable-trivial-httpd-cmdline], [AS_HELP_STRING([--enable-trivial-httpd-cmdline],
[Continue to support "ostree trivial-httpd" [default=no]])],, [Continue to support "ostree trivial-httpd" [default=no]])],,
enable_trivial_httpd_cmdline=no) enable_trivial_httpd_cmdline=no)
AM_CONDITIONAL(BUILDOPT_TRIVIAL_HTTPD, test x$enable_trivial_httpd_cmdline = xyes) AS_IF([test x$enable_trivial_httpd_cmdline = xyes],
AM_COND_IF(BUILDOPT_TRIVIAL_HTTPD,
[AC_DEFINE([BUILDOPT_ENABLE_TRIVIAL_HTTPD_CMDLINE], 1, [Define if we are enabling ostree trivial-httpd entrypoint])] [AC_DEFINE([BUILDOPT_ENABLE_TRIVIAL_HTTPD_CMDLINE], 1, [Define if we are enabling ostree trivial-httpd entrypoint])]
) )