[lxc-devel] [lxc/master] autotools: fix --disable-commands builds

brauner on Github lxc-bot at linuxcontainers.org
Wed Oct 17 13:24:46 UTC 2018


A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 364 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20181017/29a7e3ec/attachment.bin>
-------------- next part --------------
From bb760b77dfacc30487e3ec9cfad4ba3186ff1533 Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian.brauner at ubuntu.com>
Date: Wed, 17 Oct 2018 15:23:41 +0200
Subject: [PATCH] autotools: fix --disable-commands builds

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>
---
 src/lxc/Makefile.am | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am
index 8ca9caabe..c3714b8d8 100644
--- 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 \


More information about the lxc-devel mailing list