diff options
| author | Karel Zak | 2011-10-27 12:52:01 +0200 |
|---|---|---|
| committer | Karel Zak | 2011-11-03 12:32:49 +0100 |
| commit | ecde25362e59dab4c79367296b19852a1062475b (patch) | |
| tree | 226f1cb55df9ee72d45f513e0b074c6c962758c6 /configure.ac | |
| parent | build-sys: cleanup BUILD_FSCK (diff) | |
| download | kernel-qcow2-util-linux-ecde25362e59dab4c79367296b19852a1062475b.tar.gz kernel-qcow2-util-linux-ecde25362e59dab4c79367296b19852a1062475b.tar.xz kernel-qcow2-util-linux-ecde25362e59dab4c79367296b19852a1062475b.zip | |
build-sys: cleanup BUILD_PARTX
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 15 |
1 files 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 |