X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fconfig.cpp;h=36e7870683b3bfed9e1474306ee8adde2ce13a84;hb=c7df14c38a87ceca13df47fa700d3f9fa250be91;hp=75784e370d19525bef4e391ffd15d80ff873279a;hpb=d9028dec3b81c84560c580008fa68490f049e723;p=builder.git

diff --git a/source/config.cpp b/source/config.cpp
index 75784e3..36e7870 100644
--- a/source/config.cpp
+++ b/source/config.cpp
@@ -16,12 +16,14 @@ Config::Config(SourcePackage &p):
 	changed(false)
 { }
 
-void Config::add_option(const string &n, const string &v, const string &d)
+const Config::Option &Config::add_option(const Feature &f)
 {
-	Option opt(n, v, d);
-	if(pending_options.count(n))
-		opt.value = pending_options[n];
-	options.insert(OptionMap::value_type(n, opt));
+	Option opt(f);
+	InputOptions::const_iterator i = pending_options.find(opt.name);
+	if(i!=pending_options.end())
+		opt.value = i->second;
+
+	return options.insert(OptionMap::value_type(opt.name, opt)).first->second;
 }
 
 bool Config::set_option(const string &opt, const string &val)
@@ -82,15 +84,17 @@ void Config::save() const
 
 	for(OptionMap::const_iterator i=options.begin(); i!=options.end(); ++i)
 		IO::print(out, "option \"%s\" \"%s\";\n", i->second.name, i->second.value);
+
+	changed = false;
 }
 
 
-Config::Option::Option(const string &n, const string &v, const string &d):
-	name(n),
-	default_value(v),
-	description(d),
-	value(v)
-{ }
+Config::Option::Option(const Feature &f):
+	Feature(f),
+	value(default_value)
+{
+	name = "with_"+name;
+}
 
 
 Config::Loader::Loader(Config &c):