From: Mikko Rasa <tdb@tdb.fi>
Date: Thu, 16 Nov 2006 23:06:37 +0000 (+0000)
Subject: Bugfix
X-Git-Tag: 0.9~45
X-Git-Url: http://git.tdb.fi/?p=builder.git;a=commitdiff_plain;h=2dd938cdc85f2c9ffaaf66a83e8e854954aced47

Bugfix
---

diff --git a/source/package.cpp b/source/package.cpp
index 5255b86..31b36bb 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;
@@ -258,6 +261,7 @@ void Package::create_build_info()
 	}
 	else if(name=="fmod4")
 	{
+		cout<<path<<'\n';
 		export_binfo.libs.push_back("fmodex");
 		if(!path.empty())
 		{