From ecde25362e59dab4c79367296b19852a1062475b Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Thu, 27 Oct 2011 12:52:01 +0200 Subject: build-sys: cleanup BUILD_PARTX Signed-off-by: Karel Zak --- configure.ac | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/configure.ac b/configure.ac index 91ecc2346..64e1d137b 100644 --- a/configure.ac +++ b/configure.ac @@ -354,10 +354,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$build_partx" = xyes; then - AC_MSG_ERROR([libblkid is needed to build util-linux partx]) - fi fi dnl @@ -463,18 +459,11 @@ AC_ARG_ENABLE([partx], [], enable_partx=check ) build_partx=yes -if test "x$enable_partx" = xcheck; then - if test "x$linux_os" = xno; then - AC_MSG_WARN([non-linux system; do not build partx utilities]) - build_partx=no - fi -elif test "x$enable_partx" = xno; then - build_partx=no -fi +UL_REQUIRES_LINUX([partx]) +UL_REQUIRES_BUILD([partx], [libblkid]) AM_CONDITIONAL(BUILD_PARTX, test "x$build_partx" = xyes) - AC_ARG_ENABLE([uuidd], AS_HELP_STRING([--disable-uuidd], [do not build the uuid daemon]), [], enable_uuidd=auto -- cgit v1.2.3-55-g7522