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/features/marker/src/marker.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'xlators/features/marker') diff --git a/xlators/features/marker/src/marker.h b/xlators/features/marker/src/marker.h index 23d1580f0e5..b2d58d23f6c 100644 --- a/xlators/features/marker/src/marker.h +++ b/xlators/features/marker/src/marker.h @@ -18,7 +18,7 @@ #include "marker-quota.h" #include "xlator.h" #include "defaults.h" -#include "uuid.h" +#include "compat-uuid.h" #include "call-stub.h" #define MARKER_XATTR_PREFIX "trusted.glusterfs" -- cgit