From: Nikolaus Rath <Nikolaus@rath.org>
Date: Thu, 10 Nov 2016 21:11:57 +0000 (-0800)
Subject: Make test for util-linux version more robust
X-Git-Tag: fuse-3.0.0rc3~32
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0e08174044cca6578eb2d39ccb8c0f829e95a97c;p=qemu-gpiodev%2Flibfuse.git

Make test for util-linux version more robust

The current version fails on Amazon Linux. This check should work
better.

Fixes #64.
---

diff --git a/ChangeLog.rst b/ChangeLog.rst
index 6e25872..7f38ee1 100644
--- a/ChangeLog.rst
+++ b/ChangeLog.rst
@@ -3,6 +3,8 @@ UNRELEASED CHANGES
 
 * Fixed test errors when running tests as root.
 
+* Made check for util-linux version more robust.
+
 FUSE 3.0.0-rc2 (2016-11-06)
 ===========================
 
diff --git a/configure.ac b/configure.ac
index a009c0b..cd9ae75 100644
--- a/configure.ac
+++ b/configure.ac
@@ -109,20 +109,14 @@ AM_CONDITIONAL(BSD, test "$arch" = bsd)
 
 util_linux_ok=yes
 if test "$arch" = linux -a "$cross_compiling" != "yes"; then
-	AC_MSG_CHECKING([if umount supports --fake --no-canonicalize])
-	# exit code of umount is 1 if option is unrecognised, 2 otherwise
-	umount --fake --no-canonicalize > /dev/null 2>&1
-	if test $? != 1; then
-		AC_MSG_RESULT([yes])
-	else
-		firstline=`umount --fake --no-canonicalize 2>&1 | head -1`
-		if test "$firstline" = 'umount: only root can use "--fake" option'; then
-			AC_MSG_RESULT([yes])
-		else
-			AC_MSG_RESULT([$firstline])
-			util_linux_ok=no
-		fi
-	fi
+        AC_MSG_CHECKING([if umount supports --fake --no-canonicalize])
+        if umount --help 2>&1 | grep -q -- "--fake" &&
+           umount --help 2>&1 | grep -q -- "--no-canonicalize"; then
+                AC_MSG_RESULT([yes])
+        else
+                AC_MSG_RESULT([no])
+                util_linux_ok=no
+        fi
 fi
 
 AC_CONFIG_FILES([fuse3.pc Makefile lib/Makefile util/Makefile example/Makefile include/Makefile doc/Makefile test/Makefile])