Merge pull request #2697 from brauner/2018-10-17/fix_disable_commands_build

autotools: fix --disable-commands builds

Merge pull request #2697 from brauner/2018-10-17/fix_disable_commands_build
68c11e8b · Wolfgang Bumiller · GitHub · 38e76fbb · bb760b77 · 68c11e8b
Unverified Commit 68c11e8b authored Oct 18, 2018 by Wolfgang Bumiller Committed by GitHub Oct 18, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

Makefile.am src/lxc/Makefile.am +7 -1

No files found.
--- a/src/lxc/Makefile.am
+++ b/src/lxc/Makefile.am
@@ -266,11 +266,17 @@ bin_PROGRAMS = lxc-attach \
 	       lxc-top \
 	       lxc-unfreeze \
 	       lxc-unshare \
-	       lxc-usernsexec \
 	       lxc-wait
 endif

 if ENABLE_COMMANDS
+
+if ENABLE_TOOLS
+bin_PROGRAMS += lxc-usernsexec
+else
+bin_PROGRAMS = lxc-usernsexec
+endif
+
 sbin_PROGRAMS = init.lxc

 pkglibexec_PROGRAMS = lxc-monitord \