summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2011-03-17 14:05:48 +0100
committerGünther Deschner <gd@samba.org>2011-03-17 14:05:48 +0100
commit7bc381bdc57681b0822f3af22945b8bec3941ce7 (patch)
treef1a4f463162f34b7dd38d9f2a451aebe5958c117
parent4562a7914d432fd4aff7255697246290d55c847b (diff)
downloadsamba-7bc381bdc57681b0822f3af22945b8bec3941ce7.tar.gz
samba-7bc381bdc57681b0822f3af22945b8bec3941ce7.tar.bz2
samba-7bc381bdc57681b0822f3af22945b8bec3941ce7.zip
s3-waf: move HAVE_LDAP_SASL_WRAPPING define to the HAVE_LDAP block.
Guenther
-rw-r--r--source3/wscript10
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/wscript b/source3/wscript
index 508f270039..1df8a4ec03 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -560,11 +560,6 @@ msg.msg_acctrightslen = sizeof(fd);
conf.CHECK_TYPE('ber_tag_t', 'unsigned int', headers='ldap.h lber.h')
conf.CHECK_FUNCS_IN('ber_scanf ber_sockbuf_add_io', 'lber')
conf.CHECK_VARIABLE('LDAP_OPT_SOCKBUF', headers='ldap.h')
- # if ber_sockbuf_add_io() and LDAP_OPT_SOCKBUF are available, we can add
- # SASL wrapping hooks
- if conf.CONFIG_SET('HAVE_BER_SOCKBUF_ADD_IO') and \
- conf.CONFIG_SET('HAVE_LDAP_OPT_SOCKBUF'):
- conf.DEFINE('HAVE_LDAP_SASL_WRAPPING', '1')
# if we LBER_OPT_LOG_PRINT_FN we can intercept ldap logging and print it out
# for the samba logs
@@ -588,6 +583,11 @@ msg.msg_acctrightslen = sizeof(fd);
conf.DEFINE('HAVE_LDAP', '1')
conf.DEFINE('LDAP_DEPRECATED', '1')
conf.env['HAVE_LDAP'] = '1'
+ # if ber_sockbuf_add_io() and LDAP_OPT_SOCKBUF are available, we can add
+ # SASL wrapping hooks
+ if conf.CONFIG_SET('HAVE_BER_SOCKBUF_ADD_IO') and \
+ conf.CONFIG_SET('HAVE_LDAP_OPT_SOCKBUF'):
+ conf.DEFINE('HAVE_LDAP_SASL_WRAPPING', '1')
else:
conf.SET_TARGET_TYPE('ldap', 'EMPTY')
conf.SET_TARGET_TYPE('lber', 'EMPTY')