build-sys: cleanup BUILD_PARTX
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
parent
1d12ed5780
commit
ecde25362e
15
configure.ac
15
configure.ac
|
@ -354,10 +354,6 @@ AC_DEFINE_UNQUOTED(LIBBLKID_DATE, "$LIBBLKID_DATE", [libblkid date string])
|
||||||
|
|
||||||
if test "x$enable_libblkid" = xyes; then
|
if test "x$enable_libblkid" = xyes; then
|
||||||
AC_DEFINE(HAVE_LIBBLKID, 1, [Define to 1 if you have the -lblkid.])
|
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
|
fi
|
||||||
|
|
||||||
dnl
|
dnl
|
||||||
|
@ -463,18 +459,11 @@ AC_ARG_ENABLE([partx],
|
||||||
[], enable_partx=check
|
[], enable_partx=check
|
||||||
)
|
)
|
||||||
build_partx=yes
|
build_partx=yes
|
||||||
if test "x$enable_partx" = xcheck; then
|
UL_REQUIRES_LINUX([partx])
|
||||||
if test "x$linux_os" = xno; then
|
UL_REQUIRES_BUILD([partx], [libblkid])
|
||||||
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
|
|
||||||
AM_CONDITIONAL(BUILD_PARTX, test "x$build_partx" = xyes)
|
AM_CONDITIONAL(BUILD_PARTX, test "x$build_partx" = xyes)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
AC_ARG_ENABLE([uuidd],
|
AC_ARG_ENABLE([uuidd],
|
||||||
AS_HELP_STRING([--disable-uuidd], [do not build the uuid daemon]),
|
AS_HELP_STRING([--disable-uuidd], [do not build the uuid daemon]),
|
||||||
[], enable_uuidd=auto
|
[], enable_uuidd=auto
|
||||||
|
|
Loading…
Reference in New Issue