sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

dynconfig: remember which options still have their default value

Browse Source 
If the values are explicit specified on the command line, we need to
keep them.

metze
This commit is contained in:
Stefan Metzmacher 2011-06-21 12:09:40 +02:00
parent d89947ef12
commit 9f0a70535c
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dynconfig/wscript
View File

@ -100,23 +100,31 @@ def set_options(opt):
def configure(conf):
# get all the basic GNU options from the gnu_dirs tool
explicit_set = {}
for option in dir_options.keys():
default = dir_options[option][0]
varname = get_varname(option)
value = getattr(Options.options, varname, None)
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
if value is not default:
explicit_set[varname] = "%s:%s" % (default, value)
for f in dyn_cflags.keys():
v = EXPAND_VARIABLES(conf, dyn_cflags[f])
conf.ASSERT(v != '', "Empty dynconfig value for %s" % f)
conf.env[f] = v
if f not in explicit_set:
conf.env[f] = v
if Options.options.ENABLE_FHS:
for f in dyn_cflags_fhs.keys():
v = EXPAND_VARIABLES(conf, dyn_cflags_fhs[f])
conf.ASSERT(v != '', "Empty dynconfig value for %s" % f)
conf.env[f] = v
if f not in explicit_set:
conf.env[f] = v
if (not Options.options.ENABLE_FHS and
(conf.env.PREFIX == '/usr' or conf.env.PREFIX == '/usr/local')):