From 5db5772db12e41da9389863062334fcb27f29259 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 17 Mar 2010 09:05:43 +1100 Subject: [PATCH 1/1] build: fixed the build without sasl libraries We need to only enable the cyrus_sasl module if we have sasl/sasl.h --- source4/auth/gensec/wscript_build | 3 ++- source4/auth/wscript_configure | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/source4/auth/gensec/wscript_build b/source4/auth/gensec/wscript_build index 444608d6447..b9fa5f4c495 100644 --- a/source4/auth/gensec/wscript_build +++ b/source4/auth/gensec/wscript_build @@ -28,7 +28,8 @@ bld.SAMBA_MODULE('cyrus_sasl', source='cyrus_sasl.c', subsystem='gensec', init_function='gensec_sasl_init', - deps='CREDENTIALS SASL' + deps='CREDENTIALS SASL', + enabled=bld.CONFIG_SET('HAVE_SASL') ) diff --git a/source4/auth/wscript_configure b/source4/auth/wscript_configure index 842870cca34..7a932697c6c 100644 --- a/source4/auth/wscript_configure +++ b/source4/auth/wscript_configure @@ -1,6 +1,6 @@ conf.CHECK_HEADERS('security/pam_appl.h') conf.CHECK_FUNCS_IN('pam_start', 'pam') -conf.CHECK_HEADERS('sasl/sasl.h') -conf.CHECK_FUNCS_IN('sasl_client_init', 'sasl2') - +if (conf.CHECK_HEADERS('sasl/sasl.h') and + conf.CHECK_FUNCS_IN('sasl_client_init', 'sasl2')): + conf.DEFINE('HAVE_SASL', 1) -- 2.34.1