diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-03-23 09:29:51 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-06 20:27:00 +1000 |
| commit | 00649a9c6266f959dbc7d857180e43f2b1363844 (patch) | |
| tree | 52fb65dfd462e2a4baf5865a1a6c662c7f9dffc0 /source4/lib | |
| parent | f95ca1afc984ecf295b9181b2f699a72afcb4772 (diff) | |
| download | samba-00649a9c6266f959dbc7d857180e43f2b1363844.tar.gz samba-00649a9c6266f959dbc7d857180e43f2b1363844.tar.bz2 samba-00649a9c6266f959dbc7d857180e43f2b1363844.zip | |
build: updated configure checks or new syntax
Diffstat (limited to 'source4/lib')
| -rw-r--r-- | source4/lib/ldb/wscript | 2 | ||||
| -rw-r--r-- | source4/lib/tls/wscript | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript index 053d11200f..92cefab8af 100644 --- a/source4/lib/ldb/wscript +++ b/source4/lib/ldb/wscript @@ -19,7 +19,7 @@ def configure(conf): conf.sub_config(LIBTEVENT_DIR) # where does the default LIBDIR end up? in conf.env somewhere? # - conf.CONFIG_PATH('LDB_MODULESDIR', conf.SUBST_ENV_VAR('LIBDIR') + '/ldb') + conf.CONFIG_PATH('LDB_MODULESDIR', conf.SUBST_ENV_VAR('MODULESDIR') + '/ldb') conf.SAMBA_CONFIG_H() def build(bld): diff --git a/source4/lib/tls/wscript b/source4/lib/tls/wscript index 45fa55aaef..a993848cf9 100644 --- a/source4/lib/tls/wscript +++ b/source4/lib/tls/wscript @@ -15,15 +15,12 @@ def configure(conf): if 'HAVE_GNUTLS' in conf.env and not Options.options.disable_gnutls: conf.DEFINE('ENABLE_GNUTLS', 1) - conf.CHECK_FUNCS_IN('gnutls_global_init', 'gnutls', header='gnutls/gnutls.h') - - conf.CHECK_HEADERS('gnutls/gnutls.h') + conf.CHECK_FUNCS_IN('gnutls_global_init', 'gnutls', headers='gnutls/gnutls.h') # check for gnutls_datum types - conf.CHECK_TYPES('gnutls_datum gnutls_datum_t') + conf.CHECK_TYPES('gnutls_datum gnutls_datum_t', headers='gnutls/gnutls.h') - conf.CHECK_HEADERS('gcrypt.h') - conf.CHECK_FUNCS_IN('gcry_control', 'gcrypt') + conf.CHECK_FUNCS_IN('gcry_control', 'gcrypt', headers='gcrypt.h') conf.CHECK_FUNCS_IN('gpg_err_code_from_errno', 'gpg-error') |