From e19cf64356580b965c257f0b3b6ef9ca5b03ed62 Mon Sep 17 00:00:00 2001
From: Ira Cooper <ira@samba.org>
Date: Tue, 6 Mar 2012 19:22:46 -0500
Subject: [PATCH] addns: Fix the Solaris/Illumos build.

uuid_t is not defined without including sys/uuid.h, configure+waf checks added.

Signed-off-by: Jeremy Allison <jra@samba.org>
---
 lib/addns/dnsutils.c | 4 ++++
 lib/addns/wscript    | 6 ++++++
 source3/configure.in | 1 +
 wscript              | 1 +
 4 files changed, 12 insertions(+)
 create mode 100644 lib/addns/wscript

diff --git a/lib/addns/dnsutils.c b/lib/addns/dnsutils.c
index 43305a98730..5a63c61f149 100644
--- a/lib/addns/dnsutils.c
+++ b/lib/addns/dnsutils.c
@@ -25,6 +25,10 @@
 #include "dns.h"
 #include <ctype.h>
 
+#ifdef HAVE_SYS_UUID_H
+#include <sys/uuid.h>
+#endif
+
 static DNS_ERROR LabelList( TALLOC_CTX *mem_ctx,
 			    const char *name,
 			    struct dns_domain_label **presult )
diff --git a/lib/addns/wscript b/lib/addns/wscript
new file mode 100644
index 00000000000..99e9358a3db
--- /dev/null
+++ b/lib/addns/wscript
@@ -0,0 +1,6 @@
+#!/usr/bin/env python
+
+import Options
+
+def configure(conf):
+    conf.CHECK_HEADERS('sys/uuid.h')
diff --git a/source3/configure.in b/source3/configure.in
index 8c069a09cfe..3736dcbedb5 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -749,6 +749,7 @@ AC_CHECK_HEADERS(langinfo.h locale.h)
 AC_CHECK_HEADERS(xfs/libxfs.h)
 AC_CHECK_HEADERS(netgroup.h)
 AC_CHECK_HEADERS(linux/falloc.h)
+AC_CHECK_HEADERS(sys/uuid.h)
 
 AC_CHECK_HEADERS(rpcsvc/yp_prot.h,,,[[
 #if HAVE_RPC_RPC_H
diff --git a/wscript b/wscript
index 5901f5af575..96df5632267 100755
--- a/wscript
+++ b/wscript
@@ -102,6 +102,7 @@ def configure(conf):
     conf.RECURSE('pidl')
     conf.RECURSE('selftest')
     conf.RECURSE('source3')
+    conf.RECURSE('lib/addns')
 
     conf.SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS()
 
-- 
2.11.4.GIT