Bring in uuid to contrib

Signed-off-by: Vijay Bellur <vijay@gluster.com>
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>

BUG: 971 (dynamic volume management)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=971

9 files changed, 10 insertions, 10 deletions

diff --git a/xlators/mgmt/glusterd/src/Makefile.am b/xlators/mgmt/glusterd/src/Makefile.am
index 62435a31998..904e0366909 100644
--- a/xlators/mgmt/glusterd/src/Makefile.am
+++ b/xlators/mgmt/glusterd/src/Makefile.am
@@ -2,7 +2,7 @@ xlator_LTLIBRARIES = glusterd.la
 xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/mgmt
 glusterd_la_LDFLAGS = -module -avoidversion
 glusterd_la_SOURCES = glusterd.c glusterd-handler.c glusterd-sm.c glusterd-op-sm.c \
-	glusterd-utils.c glusterd3_1-mops.c glusterd-ha.c 
+	glusterd-utils.c glusterd3_1-mops.c glusterd-ha.c
 glusterd_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -luuid \
 		     $(top_builddir)/rpc/xdr/src/libgfxdr.la\
 		     $(top_builddir)/rpc/rpc-lib/src/libgfrpc.la
@@ -12,6 +12,6 @@ noinst_HEADERS = glusterd.h glusterd-utils.h glusterd-op-sm.h glusterd-sm.h glus
 AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)\
 	-I$(top_srcdir)/libglusterfs/src -shared -nostartfiles $(GF_CFLAGS)\
 	-I$(rpclibdir) -L$(xlatordir)/ -I$(CONTRIBDIR)/rbtree -I$(top_srcdir)/rpc/xdr/src\
-	-I$(top_srcdir)/rpc/rpc-lib/src
+	-I$(top_srcdir)/rpc/rpc-lib/src -I$(CONTRIBDIR)/uuid
 
 CLEANFILES =
diff --git a/xlators/mgmt/glusterd/src/glusterd-ha.h b/xlators/mgmt/glusterd/src/glusterd-ha.h
index 42684f07364..b31142a6707 100644
--- a/xlators/mgmt/glusterd/src/glusterd-ha.h
+++ b/xlators/mgmt/glusterd/src/glusterd-ha.h
@@ -26,7 +26,7 @@
 #endif
 
 #include <pthread.h>
-#include <uuid/uuid.h>
+#include "uuid.h"
 
 #include "glusterfs.h"
 #include "xlator.h"
diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
index 9ecb798edd7..0d99174b85d 100644
--- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c
+++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
@@ -27,7 +27,7 @@
 #include <sys/resource.h>
 
 #include <libgen.h>
-#include <uuid/uuid.h>
+#include "uuid.h"
 
 #include "fnmatch.h"
 #include "xlator.h"
diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.h b/xlators/mgmt/glusterd/src/glusterd-op-sm.h
index b23fafb381d..3bfbcb9a26b 100644
--- a/xlators/mgmt/glusterd/src/glusterd-op-sm.h
+++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.h
@@ -26,7 +26,7 @@
 #endif
 
 #include <pthread.h>
-#include <uuid/uuid.h>
+#include "uuid.h"
 
 #include "glusterfs.h"
 #include "xlator.h"
diff --git a/xlators/mgmt/glusterd/src/glusterd-sm.c b/xlators/mgmt/glusterd/src/glusterd-sm.c
index ba9c75872c0..c02412683ce 100644
--- a/xlators/mgmt/glusterd/src/glusterd-sm.c
+++ b/xlators/mgmt/glusterd/src/glusterd-sm.c
@@ -27,7 +27,7 @@
 #include <sys/resource.h>
 
 #include <libgen.h>
-#include <uuid/uuid.h>
+#include "uuid.h"
 
 //#include "transport.h"
 #include "fnmatch.h"
diff --git a/xlators/mgmt/glusterd/src/glusterd-sm.h b/xlators/mgmt/glusterd/src/glusterd-sm.h
index 36f7a043bb1..2c31238f145 100644
--- a/xlators/mgmt/glusterd/src/glusterd-sm.h
+++ b/xlators/mgmt/glusterd/src/glusterd-sm.h
@@ -26,7 +26,7 @@
 #endif
 
 #include <pthread.h>
-#include <uuid/uuid.h>
+#include "uuid.h"
 
 #include "rpc-clnt.h"
 #include "glusterfs.h"
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.h b/xlators/mgmt/glusterd/src/glusterd-utils.h
index dbc22f627f5..03c1b9fb6c0 100644
--- a/xlators/mgmt/glusterd/src/glusterd-utils.h
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.h
@@ -26,7 +26,7 @@
 #endif
 
 #include <pthread.h>
-#include <uuid/uuid.h>
+#include "uuid.h"
 
 #include "glusterfs.h"
 #include "xlator.h"
diff --git a/xlators/mgmt/glusterd/src/glusterd.c b/xlators/mgmt/glusterd/src/glusterd.c
index 436a8d4e1e6..8b8509d4c0b 100644
--- a/xlators/mgmt/glusterd/src/glusterd.c
+++ b/xlators/mgmt/glusterd/src/glusterd.c
@@ -27,7 +27,7 @@
 #include <sys/resource.h>
 
 #include <libgen.h>
-#include <uuid/uuid.h>
+#include "uuid.h"
 
 #include "glusterd.h"
 #include "rpcsvc.h"
diff --git a/xlators/mgmt/glusterd/src/glusterd.h b/xlators/mgmt/glusterd/src/glusterd.h
index f7f1acca7e6..d92ec31cd25 100644
--- a/xlators/mgmt/glusterd/src/glusterd.h
+++ b/xlators/mgmt/glusterd/src/glusterd.h
@@ -26,7 +26,7 @@
 #endif
 
 #include <pthread.h>
-#include <uuid/uuid.h>
+#include "uuid.h"
 
 #include "rpc-clnt.h"
 #include "glusterfs.h"