[lxc-devel] [PATCH 6/5] remove HAVE_NEWUIDMAP configurable

[Serge Hallyn]

It's not worthwhile - lxc-usernsexec will simply fail if we don't
have newuidmap.  Actually putting all code using lxc-usernsexec
and newuidmap under that configurable would get ugly.

Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>
---
 configure.ac        | 3 ---
 src/lxc/Makefile.am | 6 ------
 2 files changed, 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1131f8b..56638d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,9 +52,6 @@ esac
 AC_MSG_RESULT([$with_distro])
 AM_CONDITIONAL([HAVE_DEBIAN], [test x"$with_distro" = "xdebian" -o x"$with_distro" = "xubuntu"])
 
-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])],
diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am
index 1421251..9aad2cd 100644
--- a/src/lxc/Makefile.am
+++ b/src/lxc/Makefile.am
@@ -101,10 +101,6 @@ if ENABLE_APPARMOR
 AM_CFLAGS += -DHAVE_APPARMOR
 endif
 
-if HAVE_NEWUIDMAP
-AM_CFLAGS += -DHAVE_NEWUIDMAP
-endif
-
 if USE_CONFIGPATH_LOGS
 AM_CFLAGS += -DUSE_CONFIGPATH_LOGS
 endif
@@ -167,9 +163,7 @@ bin_PROGRAMS = \
 	lxc-destroy \
     lxc-create
 
-if HAVE_NEWUIDMAP
 bin_PROGRAMS += lxc-usernsexec
-endif
 
 pkglibexec_PROGRAMS = \
 	lxc-init
-- 
1.8.1.2