X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.cpp;h=42118a16cd56056b80214bb17b5b854df7bb4f25;hb=69ad3610053e140cb5108f53e4c46a0583e33559;hp=aaea4e68c3002428bfd937778a7e694f601bcaf9;hpb=c679a9dd1a97ae3b1ffa568143d42d02c2ca9e74;p=builder.git

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index aaea4e6..42118a1 100644
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -19,7 +19,7 @@ using namespace Msp;
 /**
 Creates a buildable package.
 */
-SourcePackage::SourcePackage(Builder &b, const string &n, const Path::Path &s):
+SourcePackage::SourcePackage(Builder &b, const string &n, const Path &s):
 	Package(b, n),
 	source(s),
 	config(*this),
@@ -28,12 +28,12 @@ SourcePackage::SourcePackage(Builder &b, const string &n, const Path::Path &s):
 	tar_files.push_back(source/"Build");
 }
 
-Msp::Path::Path SourcePackage::get_temp_dir() const
+Msp::Path SourcePackage::get_temp_dir() const
 {
 	return source/config.get_option("tempdir").value/config.get_option("profile").value;
 }
 
-Msp::Path::Path SourcePackage::get_out_dir() const
+Msp::Path SourcePackage::get_out_dir() const
 {
 	return source/config.get_option("outdir").value;
 }
@@ -106,7 +106,8 @@ void SourcePackage::do_configure(const StringMap &opts, unsigned flag)
 		{
 			const StringList &reqs=i->get_requires();
 			for(StringList::const_iterator j=reqs.begin(); j!=reqs.end(); ++j)
-				requires.push_back(builder.get_package(*j));
+				if(Package *pkg=builder.get_package(*j))
+					requires.push_back(pkg);
 		}
 
 	base_reqs=requires;
@@ -194,9 +195,9 @@ void SourcePackage::create_build_info()
 	unsigned flags=get_install_flags();
 
 	if(flags&INCLUDE)
-		export_binfo.incpath.push_back((Path::Path(config.get_option("prefix").value)/"include").str());
+		export_binfo.incpath.push_back((Path(config.get_option("prefix").value)/"include").str());
 	if(flags&LIB)
-		export_binfo.libpath.push_back((Path::Path(config.get_option("prefix").value)/"lib").str());
+		export_binfo.libpath.push_back((Path(config.get_option("prefix").value)/"lib").str());
 
 	string optimize=config.get_option("optimize").value;
 	if(lexical_cast<unsigned>(optimize))
@@ -218,6 +219,10 @@ void SourcePackage::create_build_info()
 		if(lexical_cast<bool>(config.get_option("with_"+i->name).value))
 			build_info.cflags.push_back("-DWITH_"+toupper(i->name));
 
+	for(ConditionList::iterator i=conditions.begin(); i!=conditions.end(); ++i)
+		if(i->eval())
+			build_info.add(i->get_build_info());
+
 	build_info.unique();
 
 	for(list<Component>::iterator i=components.begin(); i!=components.end(); ++i)