[SCM] Samba Shared Repository - branch master updated

Günther Deschner gd at samba.org
Wed Aug 11 04:48:58 MDT 2010


The branch, master has been updated
       via  c43e832... s3-waf: fix the waf build with more recent MIT krb5 libs.
      from  03bfd42... s4-test: Implement DRS-RPC-msDSIntId test case

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit c43e832c5160fbffb31ddd64b43dbbc8124b1ca0
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

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

Summary of changes:
 source3/wscript       |    3 +++
 source3/wscript_build |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

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 7f5414d..3a9e17d 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -911,7 +911,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


More information about the samba-cvs mailing list