From 10e1c670dd13587a7181f1fc7c64baf4066c8840 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 30 Jul 2012 07:30:46 +0000 Subject: [PATCH] add --enable-mtab to eeze to force use of deprecated mtab for mountinfo (libmount pre 2.20) SVN revision: 74556 --- legacy/eeze/configure.ac | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/legacy/eeze/configure.ac b/legacy/eeze/configure.ac index 981921e485..a382b451bf 100644 --- a/legacy/eeze/configure.ac +++ b/legacy/eeze/configure.ac @@ -146,12 +146,30 @@ if test "x$eeze_mount" = "xyes";then AC_DEFINE_UNQUOTED([EEZE_EJECT_BIN], ["$with_eject"], [eject bin to use]) fi -if test -n "$mount_v";then - AM_CONDITIONAL([OLD_LIBMOUNT], [test "$(echo $mount_v | cut -d'.' -f2)" -lt 19]) - AM_CONDITIONAL([NEW_LIBMOUNT], [test "$(echo $mount_v | cut -d'.' -f2)" -gt 19]) -else +want_mtab= +AC_ARG_ENABLE([mtab], + [AC_HELP_STRING([--enable-mtab], + [force use of mtab for mount info @<:@default=detect@:>@])], + [ + if test "x${enableval}" = "xyes" ; then + want_mtab="yes" + else + want_mtab="no" + fi], + [want_mtab="auto"]) + + +if test "x${want_mtab}" = "xyes" ; then AM_CONDITIONAL([OLD_LIBMOUNT], [false]) AM_CONDITIONAL([NEW_LIBMOUNT], [false]) +else + if test -n "$mount_v";then + AM_CONDITIONAL([OLD_LIBMOUNT], [test "$(echo $mount_v | cut -d'.' -f2)" -lt 19]) + AM_CONDITIONAL([NEW_LIBMOUNT], [test "$(echo $mount_v | cut -d'.' -f2)" -gt 19]) + else + AM_CONDITIONAL([OLD_LIBMOUNT], [false]) + AM_CONDITIONAL([NEW_LIBMOUNT], [false]) + fi fi AM_COND_IF([OLD_LIBMOUNT], [ AC_DEFINE_UNQUOTED([OLD_LIBMOUNT], [1], [using first version of libmount])