From: Karel Zak <kzak@redhat.com>
Date: Thu, 27 Oct 2011 10:44:06 +0000 (+0200)
Subject: build-sys: cleanup BUILD_FSCK
X-Git-Tag: v2.21-rc1~262
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1d12ed5780972c8784206b0016d576e908701fbd;p=thirdparty%2Futil-linux.git

build-sys: cleanup BUILD_FSCK

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/configure.ac b/configure.ac
index 39308d6fa5..91ecc2346f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -342,7 +342,7 @@ dnl
 dnl libblkid
 dnl
 AC_ARG_ENABLE([libblkid],
-  AS_HELP_STRING([--disable-libblkid], [do not build libblkid and blkid utilities]),
+  AS_HELP_STRING([--disable-libblkid], [do not build libblkid and many related utilities]),
   [], enable_libblkid=yes
 )
 AC_SUBST([LIBBLKID_DATE])
@@ -355,9 +355,6 @@ AC_DEFINE_UNQUOTED(LIBBLKID_DATE, "$LIBBLKID_DATE", [libblkid date string])
 if test "x$enable_libblkid" = xyes; then
   AC_DEFINE(HAVE_LIBBLKID, 1, [Define to 1 if you have the -lblkid.])
 else
-  if test "x$enable_fsck" = xyes; then
-    AC_MSG_ERROR([libblkid is needed to build util-linux fsck])
-  fi
   if test "x$build_partx" = xyes; then
     AC_MSG_ERROR([libblkid is needed to build util-linux partx])
   fi
@@ -454,9 +451,11 @@ AM_CONDITIONAL(BUILD_LIBMOUNT_MOUNT, test "x$build_libmount_mount" = xyes)
 
 AC_ARG_ENABLE([fsck],
   AS_HELP_STRING([--disable-fsck], [do not build fsck]),
-  [], enable_fsck=yes
+  [], enable_fsck=check
 )
-AM_CONDITIONAL(BUILD_FSCK, test "x$enable_fsck" = xyes)
+build_fsck=yes
+UL_REQUIRES_BUILD([fsck], [libblkid])
+AM_CONDITIONAL(BUILD_FSCK, test "x$build_fsck" = xyes)
 
 
 AC_ARG_ENABLE([partx],