]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
build-sys: cleanup BUILD_LSBLK
authorKarel Zak <kzak@redhat.com>
Thu, 27 Oct 2011 12:20:35 +0000 (14:20 +0200)
committerKarel Zak <kzak@redhat.com>
Thu, 3 Nov 2011 11:32:49 +0000 (12:32 +0100)
Signed-off-by: Karel Zak <kzak@redhat.com>
configure.ac

index 984ad597dc29b96ceed76435f9d6d26c8dc2145d..276a6ef35cdaac3e75b9add82b4aed545c30c1f2 100644 (file)
@@ -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