diff options
| author | Karel Zak | 2011-10-27 16:07:50 +0200 |
|---|---|---|
| committer | Karel Zak | 2011-11-03 12:32:50 +0100 |
| commit | 9f63266727c3116fbab03262690255f18f6bef35 (patch) | |
| tree | 0cbc9fe0bcdf85b5982de44aca427654844595aa /configure.ac | |
| parent | build-sys: cleanup BUILD_SWITCH_ROOT (diff) | |
| download | kernel-qcow2-util-linux-9f63266727c3116fbab03262690255f18f6bef35.tar.gz kernel-qcow2-util-linux-9f63266727c3116fbab03262690255f18f6bef35.tar.xz kernel-qcow2-util-linux-9f63266727c3116fbab03262690255f18f6bef35.zip | |
build-sys: cleanup BUILD_PIVOT_ROOT
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/configure.ac b/configure.ac index 1e700fb7d..d481796ac 100644 --- a/configure.ac +++ b/configure.ac @@ -681,7 +681,6 @@ else AM_CONDITIONAL(HAVE_UTEMPTER, false) fi -UL_CHECK_SYSCALL([pivot_root]) UL_CHECK_SYSCALL([sched_getaffinity]) UL_CHECK_SYSCALL([ioprio_set], [alpha], [442], @@ -829,23 +828,9 @@ AC_ARG_ENABLE([pivot_root], AS_HELP_STRING([--disable-pivot_root], [do not build pivot_root]), [], enable_pivot_root=check ) -if test "x$enable_pivot_root" = xno; then - build_pivot_root=no -else - build_pivot_root=yes - case $enable_pivot_root:$linux_os in - yes:no) AC_MSG_ERROR([pivot_root selected for non-linux system]);; - check:no) AC_MSG_WARN([non-linux system; do not build pivot_root]) - build_pivot_root=no;; - esac - if test "x$build_pivot_root" = xyes; then - case $enable_pivot_root:$ul_cv_syscall_pivot_root in - yes:no) AC_MSG_ERROR([pivot_root selected but pivot_root syscall not found]);; - check:no) AC_MSG_WARN([pivot_root syscall not found; do not build pivot_root]) - build_pivot_root=no;; - esac - fi -fi +build_pivot_root=yes +UL_REQUIRES_LINUX([switch_root]) +UL_REQUIRES_SYSCALL_CHECK([pivot_root], [UL_CHECK_SYSCALL([pivot_root])]) AM_CONDITIONAL(BUILD_PIVOT_ROOT, test "x$build_pivot_root" = xyes) |