From 43259d803ca650b74bda47686b6cc79b615e9362 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 1 Sep 2016 06:55:41 +0200
Subject: Minor build2-related updates

---
 build/root.build    | 4 +---
 odb/pgsql/buildfile | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/build/root.build b/build/root.build
index 5898b63..0d01e14 100644
--- a/build/root.build
+++ b/build/root.build
@@ -11,14 +11,12 @@ ixx{*}: extension = ixx
 txx{*}: extension = txx
 cxx{*}: extension = cxx
 
-cxx.poptions =+ -I$out_root -I$src_root
-
 # Load the cli module but only if it's available. This way a distribution that
 # includes pre-generated files can be built without installing cli.
 #
 using? cli
 
-if! $cli.loaded
+if! $cli.configured
 {
   define cli: file
   cli{*}: extension = cli
diff --git a/odb/pgsql/buildfile b/odb/pgsql/buildfile
index 50b3097..971617c 100644
--- a/odb/pgsql/buildfile
+++ b/odb/pgsql/buildfile
@@ -57,7 +57,7 @@ if $abi_prerelease
 else
   lib{odb-pgsql}: bin.lib.version = @-$abi_major.$abi_minor
 
-cxx.poptions =+ -DLIBODB_PGSQL_BUILD2
+cxx.poptions =+ -I$out_root -I$src_root -DLIBODB_PGSQL_BUILD2
 obja{*}: cxx.poptions += -DLIBODB_PGSQL_STATIC_BUILD
 objs{*}: cxx.poptions += -DLIBODB_PGSQL_SHARED_BUILD
 
-- 
cgit v1.1