diff options
author | Ira Cooper <ira@samba.org> | 2012-03-06 19:22:46 -0500 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2012-03-07 11:01:33 -0800 |
commit | e19cf64356580b965c257f0b3b6ef9ca5b03ed62 (patch) | |
tree | 0a5400765cd5418b711a20106e567b7976dd3adc | |
parent | 25fbf907e90a70e167c56dd63b44b0f5ff1d27a7 (diff) | |
download | samba-e19cf64356580b965c257f0b3b6ef9ca5b03ed62.tar.gz samba-e19cf64356580b965c257f0b3b6ef9ca5b03ed62.tar.bz2 samba-e19cf64356580b965c257f0b3b6ef9ca5b03ed62.zip |
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>
-rw-r--r-- | lib/addns/dnsutils.c | 4 | ||||
-rw-r--r-- | lib/addns/wscript | 6 | ||||
-rw-r--r-- | source3/configure.in | 1 | ||||
-rwxr-xr-x | wscript | 1 |
4 files changed, 12 insertions, 0 deletions
diff --git a/lib/addns/dnsutils.c b/lib/addns/dnsutils.c index 43305a9873..5a63c61f14 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 0000000000..99e9358a3d --- /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 8c069a09cf..3736dcbedb 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 @@ -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() |