From 3c3f03b81f3027ef0a25bd790605265b384b93c1 Mon Sep 17 00:00:00 2001 From: Miklos Szeredi 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/Makefile.am | 2 +- example/fusexmp_fh.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'example') diff --git a/example/Makefile.am b/example/Makefile.am index 8b123d2..0db537b 100644 --- a/example/Makefile.am +++ b/example/Makefile.am @@ -6,7 +6,7 @@ noinst_PROGRAMS = fusexmp fusexmp_fh null hello hello_ll fioc fioclient \ fsel fselclient cusexmp LDADD = ../lib/libfuse3.la -fusexmp_fh_LDADD = ../lib/libfuse3.la ../lib/libulockmgr.la +fusexmp_fh_LDADD = ../lib/libfuse3.la @fusexmp_fh_libs@ fioclient_CPPFLAGS = fioclient_LDFLAGS = 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 + +#ifdef HAVE_LIBULOCKMGR #include +#endif + #include #include #include @@ -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