remove HAVE_NEWUIDMAP and NEWUIDMAP

Always build lxc-usernsexec. Else we require having uidmap installed on the build host for no good reason. And we never actually used the NEWUIDMAP path we detected. Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com> Acked-by: Stéphane Graber <stgraber@ubuntu.com>

remove HAVE_NEWUIDMAP and NEWUIDMAP
59328d58 · Serge Hallyn · 94272b71 · 59328d58 · 59328d58
Commit 59328d58 authored Nov 21, 2013 by Serge Hallyn
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 13 deletions

configure.ac configure.ac +0 -4

Makefile.am src/lxc/Makefile.am +2 -9

No files found.
--- a/configure.ac
+++ b/configure.ac
@@ -64,10 +64,6 @@ AC_MSG_RESULT([$with_distro])
 AM_CONDITIONAL([HAVE_DEBIAN], [test x"$with_distro" = "xdebian" -o x"$with_distro" = "xubuntu"])
 AM_CONDITIONAL([DISTRO_UBUNTU], [test "x$with_distro" = "xubuntu"])

-# Detect the newuidmap tool (required for userns)
-AC_CHECK_PROG([NEWUIDMAP], [newuidmap], [newuidmap])
-AM_CONDITIONAL([HAVE_NEWUIDMAP], [test -n "$NEWUIDMAP"])
-
 # Allow disabling rpath
 AC_ARG_ENABLE([rpath],
 	[AC_HELP_STRING([--disable-rpath], [do not set rpath in executables])],

--- a/src/lxc/Makefile.am
+++ b/src/lxc/Makefile.am
@@ -124,10 +124,6 @@ if ENABLE_SELINUX
 AM_CFLAGS += -DHAVE_SELINUX
 endif

-if HAVE_NEWUIDMAP
-AM_CFLAGS += -DHAVE_NEWUIDMAP
-endif
-
 if USE_CONFIGPATH_LOGS
 AM_CFLAGS += -DUSE_CONFIGPATH_LOGS
 endif
@@ -190,11 +186,8 @@ bin_PROGRAMS = \
 	lxc-destroy \
 	lxc-create \
 	lxc-user-nic \
-	lxc-snapshot
-
-if HAVE_NEWUIDMAP
-bin_PROGRAMS += lxc-usernsexec
-endif
+	lxc-snapshot \
+	lxc-usernsexec

 pkglibexec_PROGRAMS = \
 	lxc-init