From 5267c62f8c1f483c5348d4a2e498088a41c2e945 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 12 Apr 2023 07:34:39 +0200
Subject: Implement in-process package configuration

---
 bpkg/package-skeleton.cxx | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

(limited to 'bpkg/package-skeleton.cxx')

diff --git a/bpkg/package-skeleton.cxx b/bpkg/package-skeleton.cxx
index 899fb48..afce66c 100644
--- a/bpkg/package-skeleton.cxx
+++ b/bpkg/package-skeleton.cxx
@@ -16,12 +16,14 @@
 #include <libbuild2/context.hxx>
 #include <libbuild2/variable.hxx>
 #include <libbuild2/operation.hxx>
+#include <libbuild2/diagnostics.hxx>
 
 #include <libbuild2/lexer.hxx>
 #include <libbuild2/parser.hxx>
 
 #include <libbuild2/config/utility.hxx>
 
+#include <bpkg/bpkg.hxx>
 #include <bpkg/package.hxx>
 #include <bpkg/database.hxx>
 #include <bpkg/manifest-utility.hxx>
@@ -31,19 +33,6 @@ using namespace butl;
 
 namespace bpkg
 {
-  // These are defined in bpkg.cxx and initialized by build2_init().
-  //
-  extern strings                build2_cmd_vars;
-  extern build2::scheduler      build2_sched;
-  extern build2::global_mutexes build2_mutexes;
-  extern build2::file_cache     build2_fcache;
-
-  void
-  build2_init (const common_options&);
-}
-
-namespace bpkg
-{
   // Check whether the specified configuration variable override has a project
   // variable (i.e., its name starts with config.<project>). If the last
   // argument is not NULL, then set it to the length of the variable portion.
-- 
cgit v1.1