diff options
| author | Karel Zak | 2018-10-05 11:02:26 +0200 |
|---|---|---|
| committer | Karel Zak | 2018-10-05 11:02:26 +0200 |
| commit | 7a3b35b9665648de9004fb64b2a6b3ee1418bce4 (patch) | |
| tree | 9ef3b1a27a9f4e1f58686ae44bb5fc5cf67702c1 /configure.ac | |
| parent | sfdisk: disable --activate for Hybrid GPT/MBR (diff) | |
| download | kernel-qcow2-util-linux-7a3b35b9665648de9004fb64b2a6b3ee1418bce4.tar.gz kernel-qcow2-util-linux-7a3b35b9665648de9004fb64b2a6b3ee1418bce4.tar.xz kernel-qcow2-util-linux-7a3b35b9665648de9004fb64b2a6b3ee1418bce4.zip | |
build-sys: add USE_LIBMOUNT_SUPPORT_NAMESPACES
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 9d39e3130..fcc70a55e 100644 --- a/configure.ac +++ b/configure.ac @@ -520,6 +520,11 @@ AC_CHECK_FUNCS([getusershell], [have_getusershell=yes],[have_getusershell=no]) AM_CONDITIONAL([HAVE_OPENAT], [test "x$have_openat" = xyes]) +have_setns_syscall="yes" +UL_CHECK_SYSCALL([setns]) +AS_IF([test "x$ul_cv_syscall_setns" = xno], [ + have_setns_syscall="no" +]) AC_CHECK_FUNCS([isnan], [], [AC_CHECK_LIB([m], [isnan], [MATH_LIBS="-lm"])] @@ -1084,7 +1089,12 @@ UL_REQUIRES_HAVE([libmount], [scanf_alloc_modifier], [scanf string alloc modifie AM_CONDITIONAL([BUILD_LIBMOUNT], [test "x$build_libmount" = xyes]) AM_CONDITIONAL([BUILD_LIBMOUNT_TESTS], [test "x$build_libmount" = xyes -a "x$enable_static" = xyes]) AS_IF([test "x$build_libmount" = xyes], [ - AC_DEFINE(HAVE_LIBMOUNT, 1, [Define if libmount available.]) + AC_DEFINE(HAVE_LIBMOUNT, 1, [Define if libmount available.]) + AS_IF([test "x$have_setns_syscall" = "xyes"], [ + AC_DEFINE([USE_LIBMOUNT_SUPPORT_NAMESPACES], [1], [Define to 1 if want to support namepaces.]) + ],[ + AC_MSG_WARN([libmount will be compiled without namespaces support]) + ]) ]) AC_SUBST([LIBMOUNT_VERSION]) @@ -1103,7 +1113,6 @@ AS_IF([test "x$enable_libmount_support_mtab" = xyes], [ AC_DEFINE([USE_LIBMOUNT_SUPPORT_MTAB], [1], [Define to 1 if want to support mtab.]) ]) - dnl dnl libsmartcols dnl @@ -1352,7 +1361,7 @@ AC_ARG_ENABLE([nsenter], ) UL_BUILD_INIT([nsenter]) UL_REQUIRES_LINUX([nsenter]) -UL_REQUIRES_SYSCALL_CHECK([nsenter], [UL_CHECK_SYSCALL([setns])], [setns]) +UL_REQUIRES_HAVE([nsenter], [setns_syscall], [setns syscall]) AM_CONDITIONAL([BUILD_NSENTER], [test "x$build_nsenter" = xyes]) AC_CHECK_FUNCS([setns]) |