The branch, master has been updated via 39076c5 build: Remove all references to libuuid via a8f5faa build: Add option to specify where gettext is (/usr/local by default) via c85f334 Eliminate dependency on an external uuid library. from 6634360 s3-build: Remove build of libaddns.a from the autoconf build
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 39076c5a3f8aebde8709eb9a2367b76789142aed Author: Andrew Bartlett <abart...@samba.org> Date: Sun May 27 13:20:56 2012 +1000 build: Remove all references to libuuid We simply do not need this library any more. Andrew Bartlett Autobuild-User: Andrew Bartlett <abart...@samba.org> Autobuild-Date: Sun May 27 11:08:22 CEST 2012 on sn-devel-104 commit a8f5faa09a8680b982c01223ba3b0b79c8b92d4a Author: Andriy Syrovenko <andr...@gmail.com> Date: Sat May 26 23:29:44 2012 +0300 build: Add option to specify where gettext is (/usr/local by default) This should help configure script to find gettext on FreeBSD and (possibly) some other systems as well. commit c85f33458fff24c472ad440de3bbc15ee8f94f53 Author: Andriy Syrovenko <andr...@gmail.com> Date: Sat May 26 23:41:16 2012 +0300 Eliminate dependency on an external uuid library. ----------------------------------------------------------------------- Summary of changes: buildtools/wafsamba/wscript | 6 ++++- lib/addns/dns.h | 4 --- lib/addns/dnsutils.c | 20 ++++++----------- lib/addns/wscript | 6 ----- lib/addns/wscript_build | 2 +- source3/Makefile.in | 3 +- source3/configure.in | 48 +----------------------------------------- source3/wscript | 8 +------ wscript | 1 - 9 files changed, 17 insertions(+), 81 deletions(-) delete mode 100644 lib/addns/wscript Changeset truncated at 500 lines: diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript index 7bf6a13..5e1898c 100755 --- a/buildtools/wafsamba/wscript +++ b/buildtools/wafsamba/wscript @@ -78,9 +78,13 @@ def set_options(opt): action="store", dest='PRIVATELIBDIR', default=None) opt.add_option('--with-libiconv', - help='additional directory to search for for libiconv', + help='additional directory to search for libiconv', action='store', dest='iconv_open', default='/usr/local', match = ['Checking for library iconv', 'Checking for iconv_open', 'Checking for header iconv.h']) + opt.add_option('--with-gettext', + help='additional directory to search for gettext', + action='store', dest='gettext_location', default='/usr/local', + match = ['Checking for library intl', 'Checking for header libintl.h']) gr = opt.option_group('developer options') diff --git a/lib/addns/dns.h b/lib/addns/dns.h index 2864bdf..c0820fe 100644 --- a/lib/addns/dns.h +++ b/lib/addns/dns.h @@ -42,10 +42,6 @@ #include <time.h> #include <netdb.h> -#ifdef HAVE_UUID_UUID_H -#include <uuid/uuid.h> -#endif - #include <talloc.h> /******************************************************************* diff --git a/lib/addns/dnsutils.c b/lib/addns/dnsutils.c index 5a63c61..3eeb6ab 100644 --- a/lib/addns/dnsutils.c +++ b/lib/addns/dnsutils.c @@ -22,12 +22,13 @@ License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +#include "includes.h" +#include "librpc/ndr/libndr.h" +#include "librpc/gen_ndr/ndr_misc.h" + #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, @@ -137,17 +138,10 @@ char *dns_generate_keyname( TALLOC_CTX *mem_ctx ) char *result = NULL; #if defined(WITH_DNS_UPDATES) - uuid_t uuid; - - /* - * uuid_unparse gives 36 bytes plus '\0' - */ - if (!(result = talloc_array(mem_ctx, char, 37))) { - return NULL; - } + struct GUID guid; - uuid_generate( uuid ); - uuid_unparse( uuid, result ); + guid = GUID_random(); + result = GUID_string(mem_ctx, &guid); #endif diff --git a/lib/addns/wscript b/lib/addns/wscript deleted file mode 100644 index 99e9358..0000000 --- a/lib/addns/wscript +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env python - -import Options - -def configure(conf): - conf.CHECK_HEADERS('sys/uuid.h') diff --git a/lib/addns/wscript_build b/lib/addns/wscript_build index 513060d..5fac61c 100755 --- a/lib/addns/wscript_build +++ b/lib/addns/wscript_build @@ -2,6 +2,6 @@ bld.SAMBA_LIBRARY('addns', source='dnsquery.c dnsrecord.c dnsutils.c dnssock.c dnsgss.c dnsmarshall.c error.c', - public_deps='dnshostsfile samba-util gssapi uuid resolv', + public_deps='dnshostsfile samba-util gssapi ndr resolv', private_library=True, vars=locals()) diff --git a/source3/Makefile.in b/source3/Makefile.in index ad731b3..0908637 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 a997e36..995b50e 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 0b36b22..ad055d0 100755 --- a/source3/wscript +++ b/source3/wscript @@ -785,16 +785,10 @@ int i; i = PAM_RADIO_TYPE; mandatory=True, msg="Checking whether setuidx is available") if Options.options.with_dnsupdate: - conf.CHECK_HEADERS('uuid/uuid.h') - conf.CHECK_FUNCS_IN('uuid_generate', 'uuid') - if not conf.CONFIG_SET('HAVE_UUID_UUID_H') and not conf.CONFIG_SET('HAVE_UUID_GENERATE'): - Logs.warn("--with-dnsupdate=yes but uuid support not sufficient") - elif not conf.CONFIG_SET('HAVE_KRB5'): + if not conf.CONFIG_SET('HAVE_KRB5'): 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 26a5c86..56dee2e 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() -- Samba Shared Repository