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

Merge pull request #1952 from cgwalters/trivial-rename

Browse Source 
build-sys: Rename internal conditionals for trivial-httpd
This commit is contained in:
OpenShift Merge Robot authored and GitHub committed 2019-10-23 17:53:27 +02:00
2 parents f333ae74f4 ac4e3ab3e6
commit 53f9487c5e
2 files changed
+2 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Makefile-man.am
+1 -1
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
configure.ac
+1 -2
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])]
) )