X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=5f50a6525b349eb921a04648cfd7bc44ad224384;hb=71554f76b7ae8f1f9d183dc0c522655ce458cb78;hp=d0cc1e9822922726f5a5cce8f2af3c5fa0a7b7af;hpb=9e28243c9687608ec3c32954b4031490296ae877;p=builder.git

diff --git a/source/component.cpp b/source/component.cpp
index d0cc1e9..5f50a65 100644
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -59,15 +59,14 @@ void Component::create_build_info()
 	}
 
 	final_build_info.update_from(package.get_build_info());
+	final_build_info.update_from(build_info);
+	build_info = final_build_info;
 
 	for(BuildInfo::PathList::iterator i=build_info.incpath.begin(); i!=build_info.incpath.end(); ++i)
 		*i = (package.get_source_directory() / *i).str();
 	for(BuildInfo::PathList::iterator i=build_info.libpath.begin(); i!=build_info.libpath.end(); ++i)
 		*i = (package.get_source_directory() / *i).str();
 
-	final_build_info.update_from(build_info);
-	build_info = final_build_info;
-
 	for(UseList::const_iterator i=uses.begin(); i!=uses.end(); ++i)
 	{
 		/* Select an include path that contains all the sources for this and the
@@ -348,6 +347,8 @@ void Component::Loader::require(const string &n)
 	Package *req = obj.package.get_builder().get_package_manager().find_package(n);
 	if(req)
 		obj.requires.push_back(req);
+	else
+		obj.problems.push_back(format("Required package %s not found", n));
 }
 
 void Component::Loader::source(const string &s)