diff options
| author | Niels de Vos <ndevos@redhat.com> | 2015-04-03 18:14:13 +0200 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2015-04-10 11:39:52 +0000 |
| commit | 6eb27480b6559103e4437facd7aecbcd373479c9 (patch) | |
| tree | 946b5531baddce4387ac7786f7230c3d52dd1161 /xlators/mount/fuse/src/Makefile.am | |
| parent | 26cbd3bdf5dad190559afbdf0ac125262c4e90a6 (diff) | |
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 <ndevos@redhat.com>
Reviewed-on: http://review.gluster.org/10129
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'xlators/mount/fuse/src/Makefile.am')
| -rw-r--r-- | xlators/mount/fuse/src/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
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 \ |