summaryrefslogtreecommitdiff
path: root/source3/wscript
diff options
context:
space:
mode:
Diffstat (limited to 'source3/wscript')
-rw-r--r--source3/wscript17
1 files changed, 9 insertions, 8 deletions
diff --git a/source3/wscript b/source3/wscript
index e489b8d62e..4716008e0b 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -16,7 +16,7 @@ def set_options(opt):
opt.RECURSE('build')
opt.RECURSE('../lib/nss_wrapper')
opt.RECURSE('../lib/socket_wrapper')
- opt.RECURSE('../lib/uid_wrapper')
+ opt.RECURSE('../lib/tevent')
opt.add_option('--with-static-modules',
help=("Comma-separated list of names of modules to statically link in"),
@@ -50,9 +50,9 @@ def configure(conf):
conf.RECURSE('../lib/tdb')
conf.RECURSE('../lib/talloc')
conf.RECURSE('../lib/tevent')
+ conf.RECURSE('../lib/popt')
conf.RECURSE('../lib/nss_wrapper')
conf.RECURSE('../lib/socket_wrapper')
- conf.RECURSE('../lib/uid_wrapper')
conf.CHECK_HEADERS('execinfo.h libexc.h libunwind.h')
@@ -76,6 +76,7 @@ def configure(conf):
conf.CHECK_FUNCS('shmget')
conf.CHECK_FUNCS_IN('shm_open', 'rt', checklibc=True)
conf.CHECK_FUNCS('gettext dgettext bindtextdomain textdomain')
+ conf.CHECK_FUNCS_IN('yp_get_default_domain', 'nsl')
# Check for inotify support
conf.CHECK_HEADERS('linux/inotify.h asm/unistd.h sys/inotify.h')
@@ -309,17 +310,17 @@ yp_get_default_domain
# last but not least, if ldap_init() exists, we want to use ldap
if conf.CONFIG_SET('HAVE_LDAP_INIT'):
conf.DEFINE('HAVE_LDAP', '1')
+ conf.DEFINE('LDAP_DEPRECATED', '1')
conf.env['SMBLDAP'] = 'lib/smbldap.c'
conf.env['SMBLDAPUTIL'] = 'lib/smbldap_util.c'
- #TODO: We also need to add -DLDAP_DEPRECATED to the build flags.
# Check for kerberos
conf.find_program('krb5-config', var='KRB5_CONFIG')
if conf.env.KRB5_CONFIG:
conf.check_cfg(path="krb5-config", args="--cflags --libs",
- package="gssapi", uselib_store="KRB5")
- conf.CHECK_HEADERS('krb5.h krb5/locate_plugin.h', lib='KRB5')
- conf.CHECK_HEADERS('gssapi.h gssapi/gssapi_generic.h gssapi/gssapi.h com_err.h', lib='KRB5')
+ package="gssapi", uselib_store="krb5")
+ conf.CHECK_HEADERS('krb5.h krb5/locate_plugin.h', lib='krb5')
+ conf.CHECK_HEADERS('gssapi.h gssapi/gssapi_generic.h gssapi/gssapi.h com_err.h', lib='krb5')
if conf.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'):
conf.env['WINBIND_KRB5_LOCATOR'] = 'bin/winbind_krb5_locator.so'
@@ -356,10 +357,10 @@ krb5_get_init_creds_opt_free krb5_get_init_creds_opt_get_error
krb5_enctype_to_string krb5_fwd_tgt_creds krb5_auth_con_set_req_cksumtype
krb5_get_creds_opt_alloc krb5_get_creds_opt_set_impersonate krb5_get_creds
krb5_get_credentials_for_user krb5_get_host_realm krb5_free_host_realm''',
- lib='KRB5')
+ lib='krb5')
conf.CHECK_DECLS('''krb5_get_credentials_for_user
krb5_auth_con_set_req_cksumtype''',
headers='krb5.h', always=True)
conf.SAMBA_CONFIG_H('include/config.h')
-#define static_init_idmap { idmap_tdb_init(); idmap_passdb_init(); idmap_nss_init();}
+