aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@suse.cz>2013-02-04 18:30:14 +0100
committerMiklos Szeredi <mszeredi@suse.cz>2013-02-04 18:30:14 +0100
commitf80f367815de08d7bf41939ee75e37909004d164 (patch)
treecbf980f8219d82f62e0af132c4516fdf1f0d9453
parentd7bf78d9131bbe44800d0e961eaf3881925d1219 (diff)
downloadandroid_external_fuse-f80f367815de08d7bf41939ee75e37909004d164.tar.gz
android_external_fuse-f80f367815de08d7bf41939ee75e37909004d164.tar.bz2
android_external_fuse-f80f367815de08d7bf41939ee75e37909004d164.zip
libfuse: configure: detect new util-linux
Apparently new versions of util-linux umount return with an exit status of 1 even if the "--fake" option is recognised (despite being documented otherwise). Check this condition and don't complain about util-linux version.
-rw-r--r--ChangeLog2
-rw-r--r--configure.in8
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5a648be..fa4ff2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
initialized for the "/" path. This resulted in remove_node_lru()
crashing on LOOKUP-DOTDOT. Patch by Madan Valluri
+ * libfuse: configure: detect new util-linux
+
2012-10-01 Miklos Szeredi <miklos@szeredi.hu>
* Released 2.9.2
diff --git a/configure.in b/configure.in
index 83878ad..671d670 100644
--- a/configure.in
+++ b/configure.in
@@ -103,8 +103,12 @@ if test "$arch" = linux -a "$cross_compiling" != "yes"; then
AC_MSG_RESULT([yes])
else
firstline=`umount --fake --no-canonicalize 2>&1 | head -1`
- AC_MSG_RESULT([$firstline])
- util_linux_ok=no
+ 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
fi