From f405384ad840ebe438ecf3a2ce05893857c952b2 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Fri, 7 Jan 2011 00:05:27 +0100 Subject: s3-waf: make the --with-Xdir options work more like in the classic build. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Autobuild-Date: Fri Jan 7 00:57:10 CET 2011 on sn-devel-104 --- source3/build/wscript | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source3/build/wscript') 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) -- cgit