diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-03-28 17:05:30 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-06 20:27:13 +1000 |
| commit | b9aa63887c005971b1b812893d6c1bbc50ea21b2 (patch) | |
| tree | a5e73d210538ec5b12019170cff367dc144d3d16 /source4/lib/ldb | |
| parent | bfbf43cc36ab360b34b49d7e07c2f594e2b7e7c9 (diff) | |
| download | samba-b9aa63887c005971b1b812893d6c1bbc50ea21b2.tar.gz samba-b9aa63887c005971b1b812893d6c1bbc50ea21b2.tar.bz2 samba-b9aa63887c005971b1b812893d6c1bbc50ea21b2.zip | |
s4-waf: cleanup use of LIBPOPT vs popt dependency
Diffstat (limited to 'source4/lib/ldb')
| -rw-r--r-- | source4/lib/ldb/wscript | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript index 97e345b834..e0269d7607 100644 --- a/source4/lib/ldb/wscript +++ b/source4/lib/ldb/wscript @@ -11,6 +11,7 @@ import wafsamba LIBTDB_DIR= srcdir + '/lib/tdb' LIBTEVENT_DIR= srcdir + '/lib/tevent' +LIBPOPT_DIR= srcdir + '/lib/popt' def set_options(opt): opt.BUILTIN_DEFAULT('replace') @@ -21,6 +22,7 @@ def set_options(opt): def configure(conf): conf.sub_config(LIBTDB_DIR) conf.sub_config(LIBTEVENT_DIR) + conf.sub_config(LIBPOPT_DIR) # where does the default LIBDIR end up? in conf.env somewhere? # conf.CONFIG_PATH('LDB_MODULESDIR', conf.SUBST_ENV_VAR('MODULESDIR') + '/ldb') @@ -39,6 +41,7 @@ def configure(conf): def build(bld): bld.BUILD_SUBDIR(LIBTDB_DIR) bld.BUILD_SUBDIR(LIBTEVENT_DIR) + bld.BUILD_SUBDIR(LIBPOPT_DIR) # in Samba4 we build some extra modules, and add extra # capabilities to the ldb cmdline tools |