[SCM] Samba Shared Repository - branch v3-6-test updated

[Günther Deschner]

The branch, v3-6-test has been updated
       via  1cca2cd... s3-build: pointless to link in libads and dcutils into smbcacls.
       via  aa2475f... s3-waf: fix the waf build with more recent MIT krb5 libs.
      from  4606373... s3: Make char_flags and base_reverse const arrays

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 1cca2cda84556ff345d2feb20215a71838e4419b
Author: Günther Deschner <gd at samba.org>
Date:   Fri Aug 13 13:33:40 2010 +0200

    s3-build: pointless to link in libads and dcutils into smbcacls.
    
    Guenther
    (cherry picked from commit 37177f1c05398e1d4a59bebcdb3cd16dd6e8382b)

commit aa2475f1fa8c63d51d1a4b9289ebcfa0d45c65e2
Author: Günther Deschner <gd at samba.org>
Date:   Wed Aug 11 12:45:51 2010 +0200

    s3-waf: fix the waf build with more recent MIT krb5 libs.
    
    (such as MIT krb5 1.7.1 on fedora 13).
    
    This whole area needs more work and love later, for now it builds at least.
    
    Kai, please check.
    
    Guenther
    (cherry picked from commit c43e832c5160fbffb31ddd64b43dbbc8124b1ca0)

-----------------------------------------------------------------------

Summary of changes:
 source3/Makefile.in   |    2 +-
 source3/wscript       |    3 +++
 source3/wscript_build |    2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/Makefile.in b/source3/Makefile.in
index b703e72..028c88a 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1135,7 +1135,7 @@ LOCKTEST2_OBJ = torture/locktest2.o $(PARAM_OBJ) $(LOCKING_OBJ) $(LIBSMB_OBJ) \
 SMBCACLS_OBJ = utils/smbcacls.o $(PARAM_OBJ) $(LIBSMB_OBJ) \
 		$(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) $(RPC_PARSE_OBJ) \
 		$(PASSDB_OBJ) $(GROUPDB_OBJ) $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) \
-		$(POPT_LIB_OBJ) $(DCUTIL_OBJ) $(LIBADS_OBJ) $(SMBLDAP_OBJ) 
+		$(POPT_LIB_OBJ) $(SMBLDAP_OBJ)
 
 SMBCQUOTAS_OBJ = utils/smbcquotas.o $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
 		$(PARAM_OBJ) \
diff --git a/source3/wscript b/source3/wscript
index 66bddcf..b61d110 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -542,11 +542,14 @@ return 0;
                         headers='krb5.h stdlib.h', lib='krb5',
                         addmain=False, cflags='-Werror',
                         msg="Checking whether krb5_enctype_to_string takes krb5_context argument")
+        conf.DEFINE('HAVE_KRB5', '1')
 
     else:
         conf.SET_TARGET_TYPE('krb5', 'EMPTY')
         conf.SET_TARGET_TYPE('gssapi', 'EMPTY')
         conf.SET_TARGET_TYPE('gssapi_krb5', 'EMPTY')
+        conf.SET_TARGET_TYPE('com_err', 'EMPTY')
+        conf.SET_TARGET_TYPE('k5crypto', 'EMPTY')
 
     if Options.options.with_utmp:
         conf.CHECK_FUNCS('pututline pututxline updwtmp updwtmpx getutmpx getutxent')
diff --git a/source3/wscript_build b/source3/wscript_build
index aa47d16..46abb69 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -910,7 +910,7 @@ bld.SAMBA_SUBSYSTEM('POPT_SAMBA',
 
 bld.SAMBA_SUBSYSTEM('KRBCLIENT',
                     source=KRBCLIENT_SRC,
-                    deps='krb5 gssapi gssapi_krb5',
+                    deps='krb5 k5crypto com_err gssapi gssapi_krb5',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('LIBS',


-- 
Samba Shared Repository