diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-03-17 09:05:43 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-06 20:26:49 +1000 |
| commit | 5db5772db12e41da9389863062334fcb27f29259 (patch) | |
| tree | c4a88e37fcd27a65e1bdb5ee621ca97c35283af8 | |
| parent | 3c9e8e18aac7ba5e0446a38741a3fe6af8936651 (diff) | |
| download | samba-5db5772db12e41da9389863062334fcb27f29259.tar.gz samba-5db5772db12e41da9389863062334fcb27f29259.tar.bz2 samba-5db5772db12e41da9389863062334fcb27f29259.zip | |
build: fixed the build without sasl libraries
We need to only enable the cyrus_sasl module if we have sasl/sasl.h
| -rw-r--r-- | source4/auth/gensec/wscript_build | 3 | ||||
| -rw-r--r-- | 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 444608d644..b9fa5f4c49 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 842870cca3..7a932697c6 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) |