Evaluate conditions at load time to allow more flexibility

[builder.git] / source / config.cpp

diff --git a/source/config.cpp b/source/config.cpp
index 5b43fe3e68e01aef7521f56610e2b98b134ce289..489026329ec4338390badffe13be7b5b6ef08435 100644 (file)
--- a/source/config.cpp
+++ b/source/config.cpp
@@ -18,7 +18,10 @@ Config::Config(SourcePackage &p):
 
 void Config::add_option(const string &n, const string &v, const string &d)
 {
-       options.insert(OptionMap::value_type(n, Option(n, v, d)));
+       Option opt(n, v, d);
+       if(pending_options.count(n))
+               opt.value = pending_options[n];
+       options.insert(OptionMap::value_type(n, opt));
 }
 
 const Config::Option &Config::get_option(const string &name) const
@@ -77,7 +80,10 @@ bool Config::set_option(const string &opt, const string &val)
        if(i!=options.end())
        {
                if(i->second.value!=val)
+               {
                        result = true;
+                       changed = true;
+               }
                i->second.value = val;
        }
 
@@ -119,5 +125,8 @@ Config::Loader::Loader(Config &c):
 
 void Config::Loader::option(const string &n, const string &v)
 {
-       obj.set_option(n, v);
+       if(obj.options.count(n))
+               obj.set_option(n, v);
+       else
+               obj.pending_options[n] = v;
 }