diff options
| author | Günther Deschner <gd@samba.org> | 2011-01-07 00:05:27 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2011-01-07 00:57:10 +0100 |
| commit | f405384ad840ebe438ecf3a2ce05893857c952b2 (patch) | |
| tree | 46d4de50579436111e239a3a326effc438e344ae /source3/build/wscript | |
| parent | a7bdb491885f6afd54604d8a968c12b6015daa2d (diff) | |
| download | samba-f405384ad840ebe438ecf3a2ce05893857c952b2.tar.gz samba-f405384ad840ebe438ecf3a2ce05893857c952b2.tar.bz2 samba-f405384ad840ebe438ecf3a2ce05893857c952b2.zip | |
s3-waf: make the --with-Xdir options work more like in the classic build.
Also remove duplicates and sort the tables.
Still not sure if I understand the reason of processing the flags table after
the diroptions table, as every option you give it via configure was overwritten
immediately.
Guenther
Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Fri Jan 7 00:57:10 CET 2011 on sn-devel-104
Diffstat (limited to 'source3/build/wscript')
| -rw-r--r-- | source3/build/wscript | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source3/build/wscript b/source3/build/wscript index 3b0c66a9f4..c6eb55fc29 100644 --- a/source3/build/wscript +++ b/source3/build/wscript @@ -23,6 +23,7 @@ def configure(conf): for option in dir_options.keys(): varname = get_varname(option) value = getattr(Options.options, varname, None) + value = Utils.subst_vars(value, conf.env) conf.ASSERT(value is not None, "Missing configure option %s" % varname) conf.ASSERT(varname not in conf.env, "Variable %s already defined" % varname) conf.env[varname] = value @@ -33,7 +34,8 @@ def configure(conf): v = Utils.subst_vars(v, conf.env) conf.ASSERT(v != '', "Empty dynconfig value for %s" % f) conf.ASSERT(v.find('${') == -1, "Unsubstituted variable in %s : %s : %s" % (f, dyn_cflags[f], v)) - conf.env[f] = v + if f not in conf.env: + conf.env[f] = v if f in cflags_vars: conf.DEFINE(f, v, quote=True) |