From 91b02583db1f16b96e005180eee9ffcd0345b7bc Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Tue, 28 Jan 2014 10:59:57 +0100 Subject: build: enable fusermount by default The fusermount available in gluster is customized to ensure mounting with SELinux happens properly, i.e - to have a separate thread for fuse_thread_proc which can process getxattr requests and in parallel perform sys_mount() in a different thread, thereby avoiding a deadlock. However our build and packaging defaults to not including our fusermount. This patch reverses the defaults. Backport from: > Change-Id: I793af4c2f56aeac46efae3db30e7c64ee7c18850 > BUG: 811217 > Signed-off-by: Anand Avati > Reviewed-on: http://review.gluster.org/4773 > Reviewed-by: Jeff Darcy > Tested-by: Gluster Build System Change-Id: If5fb368b6737fe8b6f22d2f2aa0785baa7f96364 BUG: 1058666 Signed-off-by: Niels de Vos Reviewed-on: http://review.gluster.org/6831 Tested-by: Gluster Build System Reviewed-by: Justin Clift Tested-by: Justin Clift Reviewed-by: Vijay Bellur --- configure.ac | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 0b64774ecd7..1bf2a8acb2a 100644 --- a/configure.ac +++ b/configure.ac @@ -258,14 +258,15 @@ AC_SUBST(FUSE_CLIENT_SUBDIR) # FUSERMOUNT section AC_ARG_ENABLE([fusermount], - AC_HELP_STRING([--enable-fusermount], - [Build fusermount])) + AC_HELP_STRING([--disable-fusermount], + [Use system's fusermount])) -BUILD_FUSERMOUNT="no" -if test "x$enable_fusermount" = "xyes"; then - FUSERMOUNT_SUBDIR="contrib/fuse-util" - BUILD_FUSERMOUNT="yes" +BUILD_FUSERMOUNT="yes" +if test "x$disable_fusermount" = "xyes"; then + BUILD_FUSERMOUNT="no" +else AC_DEFINE(GF_FUSERMOUNT, 1, [Use our own fusermount]) + FUSERMOUNT_SUBDIR="contrib/fuse-util" fi AC_SUBST(FUSERMOUNT_SUBDIR) -- cgit