Some fixes to library and header searching

[builder.git] / source / sourcepackage.cpp

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index cfe4be3f31a781ea1a5217eaaaf45ba6ec6d49f1..ef4fd5760a26fd1a90f7fb077d3256612c4b9fca 100644 (file)
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -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;
@@ -164,7 +165,7 @@ void SourcePackage::init_config()
        {
                BinaryPackage *bpkg=dynamic_cast<BinaryPackage *>(*i);
                if(bpkg && bpkg->get_need_path())
-                       config.add_option(bpkg->get_name()+"_path", "", "Path for "+bpkg->get_name());
+                       config.add_option(bpkg->get_name()+"_path", "/usr", "Path for "+bpkg->get_name());
        }
 }