From eafb7e33bcb78e87dc3781fc2c9bf9a31f5281b2 Mon Sep 17 00:00:00 2001 From: Christian Ambach Date: Wed, 16 Apr 2014 00:36:25 +0200 Subject: [PATCH] waf: add --with-fake-kaserver option This option was not added during the transition from autoconf to waf. Bring it back so that the code can be used again. Bug: https://bugzilla.samba.org/show_bug.cgi?id=9916 Signed-off-by: Christian Ambach Reviewed-by: Andrew Bartlett --- lib/afs/wscript_build | 2 +- source3/wscript | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/lib/afs/wscript_build b/lib/afs/wscript_build index 7337491fe7c..d584a170289 100644 --- a/lib/afs/wscript_build +++ b/lib/afs/wscript_build @@ -2,7 +2,7 @@ bld.SAMBA3_SUBSYSTEM('LIBAFS', source='afs_funcs.c', - deps='samba-util LIBAFS_SETTOKEN') + deps='samba-util crypto LIBAFS_SETTOKEN') bld.SAMBA3_SUBSYSTEM('LIBAFS_SETTOKEN', source='afs_settoken.c', diff --git a/source3/wscript b/source3/wscript index cf9d7873211..819ea9bb663 100644 --- a/source3/wscript +++ b/source3/wscript @@ -49,6 +49,9 @@ def set_options(opt): opt.SAMBA3_ADD_OPTION('regedit', default=None) + opt.SAMBA3_ADD_OPTION('fake-kaserver', + help=("Include AFS fake-kaserver support"), default=False) + opt.add_option('--with-ctdb-dir', help=("Directory under which ctdb is installed"), action="store", dest='ctdb_dir', default=None) @@ -1798,6 +1801,16 @@ main() { else: Logs.info("ncurses not available, not building regedit") + conf.CHECK_FUNCS_IN('DES_pcbc_encrypt', 'crypto') + if Options.options.with_fake_kaserver == True: + conf.CHECK_HEADERS('afs/param.h afs/stds.h', together=True) + conf.CHECK_HEADERS('afs/param.h afs/stds.h', together=True) + if (conf.CONFIG_SET('HAVE_AFS_PARAM_H') and conf.CONFIG_SET('HAVE_AFS_STDS_H') and conf.CONFIG_SET('HAVE_DES_PCBC_ENCRYPT')): + conf.DEFINE('WITH_FAKE_KASERVER', '1') + else: + conf.fatal('AFS headers not available, but --with-fake-kaserver was specified') + + default_static_modules.extend(TO_LIST('''pdb_smbpasswd pdb_tdbsam pdb_wbc_sam auth_sam auth_unix auth_winbind auth_wbc -- 2.11.4.GIT