diff --git a/configure.ac b/configure.ac index e85e55898..5091d69d0 100644 --- 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])], diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am index 8baf1698d..59f381008 100644 --- 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