From 3c3f03b81f3027ef0a25bd790605265b384b93c1 Mon Sep 17 00:00:00 2001
From: Miklos Szeredi <mszeredi@suse.cz>
Date: Thu, 25 Jul 2013 17:58:48 +0200
Subject: ulockmgr: strip ulockmgr support from this source package

Distribute ulockmgr separately.  It is not needed for the building of
libfuse, only fusexmp_fh.  Check ulockmgr library in ./configure and if not
disable remote-lock suport in fusexmp_fh.
---
 example/fusexmp_fh.c | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'example/fusexmp_fh.c')

diff --git a/example/fusexmp_fh.c b/example/fusexmp_fh.c
index 3be5071..ba6789b 100755
--- a/example/fusexmp_fh.c
+++ b/example/fusexmp_fh.c
@@ -29,7 +29,11 @@
 #define _GNU_SOURCE
 
 #include <fuse.h>
+
+#ifdef HAVE_LIBULOCKMGR
 #include <ulockmgr.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -500,6 +504,7 @@ static int xmp_removexattr(const char *path, const char *name)
 }
 #endif /* HAVE_SETXATTR */
 
+#ifdef HAVE_LIBULOCKMGR
 static int xmp_lock(const char *path, struct fuse_file_info *fi, int cmd,
 		    struct flock *lock)
 {
@@ -508,6 +513,7 @@ static int xmp_lock(const char *path, struct fuse_file_info *fi, int cmd,
 	return ulockmgr_op(fi->fh, cmd, lock, &fi->lock_owner,
 			   sizeof(fi->lock_owner));
 }
+#endif
 
 static int xmp_flock(const char *path, struct fuse_file_info *fi, int op)
 {
@@ -562,7 +568,9 @@ static struct fuse_operations xmp_oper = {
 	.listxattr	= xmp_listxattr,
 	.removexattr	= xmp_removexattr,
 #endif
+#ifdef HAVE_LIBULOCKMGR
 	.lock		= xmp_lock,
+#endif
 	.flock		= xmp_flock,
 };
 
-- 
cgit v1.2.3