From 6eb27480b6559103e4437facd7aecbcd373479c9 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Fri, 3 Apr 2015 18:14:13 +0200 Subject: build: make contrib/uuid dependency optional On Linux systems we should use the libuuid from the distribution and not bundle and statically link the contrib/uuid/ bits. libglusterfs/src/compat-uuid.h has been introduced and should become an abstraction layer for different UUID APIs. Non-Linux operating systems should implement their compatibility layer there. Once all operating systems have an implementation in compat-uuid.h, we can remove contrib/uuid/ from the repository completely. Change-Id: I345e5357644be2521685e00358bb8c83c4ea0577 BUG: 1206587 Signed-off-by: Niels de Vos Reviewed-on: http://review.gluster.org/10129 Tested-by: Gluster Build System Reviewed-by: Vijay Bellur --- xlators/mount/fuse/src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'xlators/mount') diff --git a/xlators/mount/fuse/src/Makefile.am b/xlators/mount/fuse/src/Makefile.am index 7d1f93447bf..749fb3bbbb5 100644 --- a/xlators/mount/fuse/src/Makefile.am +++ b/xlators/mount/fuse/src/Makefile.am @@ -27,7 +27,7 @@ fuse_la_SOURCES = fuse-helpers.c fuse-resolve.c fuse-bridge.c \ $(CONTRIBDIR)/fuse-lib/misc.c $(mount_source) fuse_la_LDFLAGS = -module -avoid-version -fuse_la_LIBADD = @GF_FUSE_LDADD@ +fuse_la_LIBADD = $(GF_LDADD) @GF_FUSE_LDADD@ AM_CPPFLAGS = $(GF_CPPFLAGS) \ -I$(top_srcdir)/libglusterfs/src -I$(CONTRIBDIR)/fuse-include \ -- cgit