The branch, master has been updated via ee9d075 nss_wrapper: check for nss.h from b8fce2c libcli/smb: use lib/crypto SHA512 functions, do not depend on heimdal.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit ee9d075ae44ca8fdfa16afe878038711641f9a0c Author: Andreas Schneider <a...@samba.org> Date: Wed Oct 15 11:29:12 2014 +0200 nss_wrapper: check for nss.h Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Ralph Boehme <s...@samba.org> Autobuild-User(master): Ralph Böhme <s...@samba.org> Autobuild-Date(master): Wed Oct 15 14:06:11 CEST 2014 on sn-devel-104 ----------------------------------------------------------------------- Summary of changes: lib/nss_wrapper/wscript | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/nss_wrapper/wscript b/lib/nss_wrapper/wscript index 94d23d5..b25b83d 100644 --- a/lib/nss_wrapper/wscript +++ b/lib/nss_wrapper/wscript @@ -9,6 +9,8 @@ def configure(conf): conf.DEFINE('USING_SYSTEM_NSS_WRAPPER', 1) libnss_wrapper_so_path = 'libnss_wrapper.so' else: + conf.CHECK_HEADERS('nss.h') + # check HAVE_GCC_THREAD_LOCAL_STORAGE conf.CHECK_CODE(''' __thread int tls; @@ -94,7 +96,7 @@ def configure(conf): conf.DEFINE('NSS_WRAPPER', 1) def build(bld): - if not bld.CONFIG_SET("USING_SYSTEM_NSS_WRAPPER"): + if bld.CONFIG_SET("HAVE_NSS_H") and not bld.CONFIG_SET("USING_SYSTEM_NSS_WRAPPER"): # We need to do it this way or the library wont work. # Using private_library=True will add symbol version which # breaks preloading! -- Samba Shared Repository