build: fixed the build without sasl libraries

We need to only enable the cyrus_sasl module if we have sasl/sasl.h

diff --git a/source4/auth/gensec/wscript_build b/source4/auth/gensec/wscript_build
index 444608d644712e66a743f418f0bcf4a79502334a..b9fa5f4c4958c33266b36ea29b6ef1e7037e3560 100644 (file)
--- 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 842870cca34b8442aa380aef39db523c25492e81..7a932697c6ca0c74e103331844d6c067efee151b 100644 (file)
--- 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)