X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpackage.cpp;h=c5e0ffc3428b6629645c7ae3698f000c8a0560f4;hb=74c78ff5d4599ecc0ae14c8b3b8d30d1409e1e88;hp=5255b864dd8aac6b44eff025dd736fdbdacd5de2;hpb=6613371a07a1a9a8d5dead488092015261a9bf5f;p=builder.git

diff --git a/source/package.cpp b/source/package.cpp
index 5255b86..c5e0ffc 100644
--- a/source/package.cpp
+++ b/source/package.cpp
@@ -81,28 +81,31 @@ line.
 */
 void Package::configure(const RawOptionMap &opts, unsigned flag)
 {
-	if(conf_done || !buildable)
+	if(conf_done)
 		return;
-	
+
 	if(builder.get_verbose()>=3)
 		cout<<"Configuring "<<name<<'\n';
-	
-	init_config();
 
-	if(flag && config.process(opts) && !builder.get_dry_run())
-	{
-		if(builder.get_verbose()>=2)
-			cout<<"Configuration of "<<name<<" changed.\n";
-		config.save(source/".options.cache");
-	}
-	
-	for(PackageList::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
+	if(buildable)
 	{
-		(*i)->configure(opts, flag&2);
-		if((*i)->get_need_path())
-			(*i)->set_path(config.get_option((*i)->get_name()+"_path").value);
+		init_config();
+
+		if(flag && config.process(opts) && !builder.get_dry_run())
+		{
+			if(builder.get_verbose()>=2)
+				cout<<"Configuration of "<<name<<" changed\n";
+			config.save(source/".options.cache");
+		}
+
+		for(PackageList::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
+		{
+			if((*i)->get_need_path())
+				(*i)->set_path(config.get_option((*i)->get_name()+"_path").value);
+			(*i)->configure(opts, flag&2);
+		}
 	}
-	
+
 	create_build_info();
 
 	conf_done=true;