The patch add new option --with-fsprobe=<name> (where the <name> is blkid or volume_id). The blkid is default. The mount cannot be compiled without a filesystem detection library. Signed-off-by: Kay Sievers <kay.sievers@xxxxxxxx> Signed-off-by: Karel Zak <kzak@xxxxxxxxxx> --- configure.ac | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index d24ce09..e3ae318 100644 --- a/configure.ac +++ b/configure.ac @@ -56,8 +56,30 @@ AM_CONDITIONAL(HAVE_LIBUTIL, test x$ac_cv_lib_util_openpty = xyes) AC_CHECK_LIB(termcap, tgetnum) AM_CONDITIONAL(HAVE_TERMCAP, test x$ac_cv_lib_termcap_tgetnum = xyes) -AC_CHECK_LIB(blkid, blkid_known_fstype) -AM_CONDITIONAL(HAVE_BLKID, test x$ac_cv_lib_blkid_blkid_known_fstype = xyes) + +AC_ARG_WITH([fsprobe], + AC_HELP_STRING([--with-fsprobe], [library to guess filesystems (blkid|volume_id), default is blkid]), + with_fsprobe=$withval, with_fsprobe=blkid +) + +if test x$with_fsprobe = xblkid; then + AC_CHECK_LIB(blkid, blkid_known_fstype) + if test x$ac_cv_lib_blkid_blkid_known_fstype = xyes; then + fsprobe=blkid + fi +elif test x$with_fsprobe = xvolume_id; then + AC_CHECK_LIB(volume_id, volume_id_open_fd) + if test x$ac_cv_lib_volume_id_volume_id_open_fd = xyes; then + fsprobe=volume_id + fi +fi + +if test -z "$fsprobe"; then + AC_MSG_ERROR([Without blkid or volume_id you will not be able to build util-linux-ng.]) +fi + +AM_CONDITIONAL(HAVE_BLKID, test x"$fsprobe" = xblkid) +AM_CONDITIONAL(HAVE_VOLUME_ID, test x"$fsprobe" = xvolume_id) AM_GNU_GETTEXT_VERSION([0.14.1]) -- 1.5.0.6 - To unsubscribe from this list: send the line "unsubscribe util-linux-ng" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
