From 39076c5a3f8aebde8709eb9a2367b76789142aed Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sun, 27 May 2012 13:20:56 +1000
Subject: build: Remove all references to libuuid

We simply do not need this library any more.

Andrew Bartlett

Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Sun May 27 11:08:22 CEST 2012 on sn-devel-104
---
 lib/addns/wscript    |  7 -------
 source3/Makefile.in  |  3 +--
 source3/configure.in | 48 ++----------------------------------------------
 source3/wscript      |  2 --
 wscript              |  1 -
 5 files changed, 3 insertions(+), 58 deletions(-)
 delete mode 100644 lib/addns/wscript

diff --git a/lib/addns/wscript b/lib/addns/wscript
deleted file mode 100644
index 83945bc1b4..0000000000
--- a/lib/addns/wscript
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-import Options
-
-def configure(conf):
-    pass
-    #conf.CHECK_HEADERS('sys/uuid.h')
diff --git a/source3/Makefile.in b/source3/Makefile.in
index ad731b37cf..090863797a 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -102,7 +102,6 @@ IDMAP_LIBS=@IDMAP_LIBS@
 KRB5LIBS=@KRB5_LIBS@
 LDAP_LIBS=@LDAP_LIBS@
 NSCD_LIBS=@NSCD_LIBS@
-UUID_LIBS=@UUID_LIBS@
 LIBWBCLIENT=@LIBWBCLIENT_STATIC@ @LIBWBCLIENT_SHARED@
 LIBWBCLIENT_LIBS=@LIBWBCLIENT_LIBS@
 PTHREAD_LDFLAGS=@PTHREAD_LDFLAGS@
@@ -1901,7 +1900,7 @@ bin/smbclient: $(BINARY_PREREQS) $(CLIENT_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTD
 bin/net: $(BINARY_PREREQS) $(NET_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT) $(LIBNETAPI)
 	@echo Linking $@
 	@$(CC) -o $@ $(NET_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \
-		$(POPT_LIBS) $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) \
+		$(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) \
 		$(PASSDB_LIBS) $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) \
 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS) $(LIBNETAPI_LIBS) \
 		$(ZLIB_LIBS)
diff --git a/source3/configure.in b/source3/configure.in
index a997e3621e..995b50e6ac 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -90,7 +90,6 @@ AC_SUBST(ACL_LIBS)
 AC_SUBST(PASSDB_LIBS)
 AC_SUBST(IDMAP_LIBS)
 AC_SUBST(KRB5_LIBS)
-AC_SUBST(UUID_LIBS)
 AC_SUBST(LDAP_LIBS)
 AC_SUBST(GPEXT_LIBS)
 AC_SUBST(PAM_MODULES)
@@ -610,7 +609,6 @@ 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(CommonCrypto/CommonDigest.h)
 
 AC_CHECK_HEADERS(rpcsvc/yp_prot.h,,,[[
@@ -4171,51 +4169,12 @@ if test x"$with_dnsupdate_support" != x"no"; then
 			with_dnsupdate_support=no
 		fi
 	fi
-  ##################################################################
-  # then test for uuid.h (necessary to generate unique DNS keynames
-  # (uuid.h is required for this test)
-	AC_CHECK_HEADERS(uuid/uuid.h)
-
-	
-	if test x"$ac_cv_header_uuid_uuid_h" != x"yes"; then
-		if test x"$with_dnsupdate_support" = x"yes"; then
-			AC_MSG_ERROR(uuid.h is needed to enable DNS Updates support)
-		else
-			AC_MSG_NOTICE(uuid.h is needed to enable DNS Updates support)
-		fi
-		with_dnsupdate_support=no
-	fi
 fi
 
 if test x"$with_dnsupdate_support" != x"no"; then
-
-  ########################################################
-  # Now see if we can find the uuid libs in standard paths
-  # On some systems, the uuid API is in libc, so we have to
-  # be careful not to insert a spurious -luuid.
-
-  UUID_LIBS=""
-  AC_LIBTESTFUNC(uuid, uuid_generate,
-	  [
-	    case " $LIBS " in
-		*\ -luuid\ *)
-		UUID_LIBS="-luuid"
-		SMB_REMOVE_LIB(uuid)
-		;;
-	    esac
-
-	    with_dnsupdate_support=yes
-	    AC_DEFINE(WITH_DNS_UPDATES,1,[Whether to enable DNS Update support])
-	],
-	[
-	    if test x"$with_dnsupdate_support" = x"yes"; then
-		AC_MSG_ERROR(libuuid is needed to enable DNS Updates support)
-	    else
-		AC_MSG_WARN(libuuid is needed to enable DNS Updates support)
-	    fi
-	    with_dnsupdate_support=no
-	])
+      AC_DEFINE(WITH_DNS_UPDATES,1,[Whether to enable DNS Update support])
 fi
+
   # finally print out the result:
 AC_MSG_CHECKING(whether DNS Updates support is used)
 AC_MSG_RESULT([$with_dnsupdate_support])
@@ -6682,9 +6641,6 @@ fi
 if test x"$with_ldap_support" != x"no"; then
     AC_MSG_RESULT([    LDAP_LIBS = $LDAP_LIBS])
 fi
-if test x"$with_dnsupdate_support" != x"no"; then
-    AC_MSG_RESULT([    UUID_LIBS = $UUID_LIBS])
-fi
 if test x"$have_dnssd_support" != x"no"; then
     AC_MSG_RESULT([    DNSSD_LIBS = $DNSSD_LIBS])
 fi
diff --git a/source3/wscript b/source3/wscript
index 6aa4c97c49..ad055d06ca 100755
--- a/source3/wscript
+++ b/source3/wscript
@@ -789,8 +789,6 @@ int i; i = PAM_RADIO_TYPE;
             Logs.warn("--with-dnsupdate=yes but gssapi support not sufficient")
         else:
             conf.DEFINE('WITH_DNS_UPDATES', 1)
-    else:
-        conf.SET_TARGET_TYPE('uuid', 'EMPTY')
     conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h')
     if Options.options.developer:
         if conf.CONFIG_SET('HAVE_VALGRIND_H') or conf.CONFIG_SET('HAVE_VALGRIND_VALGRIND_H'):
diff --git a/wscript b/wscript
index 26a5c8611c..56dee2ea0c 100755
--- a/wscript
+++ b/wscript
@@ -123,7 +123,6 @@ def configure(conf):
     conf.RECURSE('pidl')
     conf.RECURSE('selftest')
     conf.RECURSE('source3')
-    conf.RECURSE('lib/addns')
 
     conf.SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS()
 
-- 
cgit