From da863cd132e6d6024707027459b371c2bff9ca71 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 5 Sep 2018 11:35:00 +0200
Subject: Adjust pkg-config logic to cover binless libraries

---
 build2/cc/common.hxx | 37 ++++++++++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 9 deletions(-)

(limited to 'build2/cc/common.hxx')

diff --git a/build2/cc/common.hxx b/build2/cc/common.hxx
index 952e383..2a1a2dd 100644
--- a/build2/cc/common.hxx
+++ b/build2/cc/common.hxx
@@ -287,15 +287,6 @@ namespace build2
       dir_paths
       extract_library_dirs (const scope&) const;
 
-      bool
-      pkgconfig_load (action, const scope&,
-                      bin::lib&, bin::liba*, bin::libs*,
-                      const optional<project_name>&,
-                      const string&,
-                      const dir_path&,
-                      const dir_paths&,
-                      const dir_paths&) const; // pkgconfig.cxx
-
       // Alternative search logic for VC (msvc.cxx).
       //
       bin::liba*
@@ -310,6 +301,34 @@ namespace build2
                           const prerequisite_key&,
                           bool existing) const;
 
+      // The pkg-config file searching and loading (pkgconfig.cxx)
+      //
+      using pkgconfig_callback = function<bool (dir_path&& d)>;
+
+      bool
+      pkgconfig_search (const dir_path&, const pkgconfig_callback&) const;
+
+      pair<path, path>
+      pkgconfig_search (const dir_path&,
+                        const optional<project_name>&,
+                        const string&) const;
+
+      void
+      pkgconfig_load (action, const scope&,
+                      bin::lib&, bin::liba*, bin::libs*,
+                      const pair<path, path>&,
+                      const dir_path&,
+                      const dir_paths&,
+                      const dir_paths&) const;
+
+      bool
+      pkgconfig_load (action, const scope&,
+                      bin::lib&, bin::liba*, bin::libs*,
+                      const optional<project_name>&,
+                      const string&,
+                      const dir_path&,
+                      const dir_paths&,
+                      const dir_paths&) const;
     };
   }
 }
-- 
cgit v1.1