From: Karel Zak Date: Thu, 27 Oct 2011 12:20:35 +0000 (+0200) Subject: build-sys: cleanup BUILD_LSBLK X-Git-Tag: v2.21-rc1~257 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a13cdb7a2d493777588dd98ba4c7ad4f280319c0;p=thirdparty%2Futil-linux.git build-sys: cleanup BUILD_LSBLK Signed-off-by: Karel Zak --- diff --git a/configure.ac b/configure.ac index 984ad597dc..276a6ef35c 100644 --- a/configure.ac +++ b/configure.ac @@ -794,16 +794,14 @@ else fi AM_CONDITIONAL(BUILD_CRAMFS, test "x$build_cramfs" = xyes) + +enable_lsblk=check build_lsblk=yes -if test "x$have_openat" = xno; then - AC_MSG_WARN([openat() function not found; do not build lsblk]) - build_lsblk=no -elif test "x$linux_os" = xno; then - AC_MSG_WARN([non-linux system; do not build lsblk]) - build_lsblk=no -fi +UL_REQUIRES_LINUX([lsblk]) +UL_REQUIRES_BUILD([lsblk], [libblkid]) AM_CONDITIONAL(BUILD_LSBLK, test "x$build_lsblk" = xyes) + AC_ARG_ENABLE([switch_root], AS_HELP_STRING([--disable-switch_root], [do not build switch_root]), [], enable_switch_root=check