build-sys: add --with=fsprobe=builtin
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
parent
940817b736
commit
b446754d27
26
configure.ac
26
configure.ac
|
@ -192,17 +192,25 @@ AC_ARG_ENABLE([mount],
|
||||||
|
|
||||||
AM_CONDITIONAL(HAVE_BLKID, false)
|
AM_CONDITIONAL(HAVE_BLKID, false)
|
||||||
AM_CONDITIONAL(HAVE_VOLUME_ID, false)
|
AM_CONDITIONAL(HAVE_VOLUME_ID, false)
|
||||||
|
AM_CONDITIONAL(BUILD_LIBBLKID, false)
|
||||||
|
|
||||||
|
build_mount=yes
|
||||||
|
have_blkid=no
|
||||||
|
have_volume_id=no
|
||||||
|
if test "x$with_fsprobe" = xblkid; then
|
||||||
|
UTIL_CHECK_LIB(blkid, blkid_known_fstype)
|
||||||
|
elif test "x$with_fsprobe" = xvolume_id; then
|
||||||
|
UTIL_CHECK_LIB(volume_id, volume_id_encode_string)
|
||||||
|
elif test "x$with_fsprobe" = xbuiltin; then
|
||||||
|
have_blkid=yes
|
||||||
|
AC_DEFINE(HAVE_LIBBLKID,1,[Define to 1 if you have the -lblkid.])
|
||||||
|
AM_CONDITIONAL(HAVE_BLKID, true)
|
||||||
|
AM_CONDITIONAL(BUILD_LIBBLKID, true)
|
||||||
|
fi
|
||||||
|
|
||||||
if test "${enable_mount}" = "no"; then
|
if test "${enable_mount}" = "no"; then
|
||||||
build_mount=no
|
build_mount=no
|
||||||
elif test "x$linux_os" = xyes; then
|
elif test "x$linux_os" = xyes; then
|
||||||
build_mount=yes
|
|
||||||
have_blkid=no
|
|
||||||
have_volume_id=no
|
|
||||||
if test "x$with_fsprobe" = xblkid; then
|
|
||||||
UTIL_CHECK_LIB(blkid, blkid_known_fstype)
|
|
||||||
elif test "x$with_fsprobe" = xvolume_id; then
|
|
||||||
UTIL_CHECK_LIB(volume_id, volume_id_encode_string)
|
|
||||||
fi
|
|
||||||
if test "x$have_blkid" = xno && test "x$have_volume_id" = xno; then
|
if test "x$have_blkid" = xno && test "x$have_volume_id" = xno; then
|
||||||
AC_MSG_ERROR([blkid or volume_id is needed to build util-linux-ng mount utilities])
|
AC_MSG_ERROR([blkid or volume_id is needed to build util-linux-ng mount utilities])
|
||||||
fi
|
fi
|
||||||
|
@ -210,8 +218,10 @@ else
|
||||||
AC_MSG_WARN([non-linux system; do not build mount utilities])
|
AC_MSG_WARN([non-linux system; do not build mount utilities])
|
||||||
build_mount=no
|
build_mount=no
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AM_CONDITIONAL(BUILD_MOUNT, test "x$build_mount" = xyes)
|
AM_CONDITIONAL(BUILD_MOUNT, test "x$build_mount" = xyes)
|
||||||
|
|
||||||
|
|
||||||
dnl UTIL_PKG_STATIC(VARIABLE, MODULES)
|
dnl UTIL_PKG_STATIC(VARIABLE, MODULES)
|
||||||
dnl ----------------------------------
|
dnl ----------------------------------
|
||||||
AC_DEFUN([UTIL_PKG_STATIC], [
|
AC_DEFUN([UTIL_PKG_STATIC], [
|
||||||
|
|
|
@ -1 +1,5 @@
|
||||||
SUBDIRS = blkid
|
SUBDIRS =
|
||||||
|
|
||||||
|
if BUILD_LIBBLKID
|
||||||
|
SUBDIRS += blkid
|
||||||
|
endif
|
||||||
|
|
Loading…
Reference in New Issue