From: Karel Zak <kzak@redhat.com>
Date: Wed, 9 May 2007 15:35:27 +0000 (+0200)
Subject: mount: fsprobe: add libvolume_id support to configure.ac
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40f07ff767e50d6e3b0e778d2c35f3c1e4d94106;p=util-linux

mount: fsprobe: add libvolume_id support to configure.ac

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@vrfy.org>
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/configure.ac b/configure.ac
index 2ee7e92a..983ceab3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,8 +71,26 @@ AC_DEFUN([UTIL_CHECK_LIB], [
 UTIL_CHECK_LIB(uuid, uuid_is_null)
 UTIL_CHECK_LIB(util, openpty)
 UTIL_CHECK_LIB(termcap, tgetnum)
-UTIL_CHECK_LIB(blkid, blkid_known_fstype)
 
+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
+)
+
+AM_CONDITIONAL(HAVE_BLKID, false)
+AM_CONDITIONAL(HAVE_VOLUME_ID, false)
+
+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_open_fd)
+fi
+
+if test $have_blkid = no && test $have_volume_id = no; then
+  AC_MSG_ERROR([Without blkid or volume_id you will not be able to build util-linux-ng.])
+fi
 
 AM_GNU_GETTEXT_VERSION([0.14.1])
 AM_GNU_GETTEXT([external])