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

diff --git a/source3/wscript b/source3/wscript
index 66bddcf858068104bd95eea11e19e63cf666f686..b61d11066766053f0ed4cd7341bf20ae603bffbf 100644 (file)
--- 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 7f5414d4c1f72774aa8001456eaf04c7c83e3733..3a9e17d74277168ddbedca62325f8fd7999e5a86 100644 (file)
--- 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',