From dc46fa754baa446d5428ba38db0d637a17b91c57 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 17 Aug 2016 12:53:37 +0200
Subject: Add support for config.bin.{lib,exe}.{prefix,suffix}

This replaces the bin.libprefix functionality.
---
 build2/config/utility     | 6 +++---
 build2/config/utility.cxx | 4 ++--
 build2/config/utility.txx | 3 +--
 3 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'build2/config')

diff --git a/build2/config/utility b/build2/config/utility
index d11a38b..aa7dc7e 100644
--- a/build2/config/utility
+++ b/build2/config/utility
@@ -72,12 +72,12 @@ namespace build2
     // out some fallback. See config.bin.target for an example.
     //
     pair<const value*, bool>
-    required (scope& root, const variable&);
+    omitted (scope& root, const variable&);
 
     inline pair<const value*, bool>
-    required (scope& root, const string& name)
+    omitted (scope& root, const string& name)
     {
-      return required (root, var_pool.find (name));
+      return omitted (root, var_pool.find (name));
     }
 
     // Set, if necessary, an optional config.* variable. In particular,
diff --git a/build2/config/utility.cxx b/build2/config/utility.cxx
index 45417f1..9131620 100644
--- a/build2/config/utility.cxx
+++ b/build2/config/utility.cxx
@@ -15,9 +15,9 @@ namespace build2
   namespace config
   {
     pair<const value*, bool>
-    required (scope& r, const variable& var)
+    omitted (scope& r, const variable& var)
     {
-      // This is a stripped-down version of the other required() twisted
+      // This is a stripped-down version of the required() twisted
       // implementation.
 
       pair<lookup, size_t> org (r.find_original (var));
diff --git a/build2/config/utility.txx b/build2/config/utility.txx
index ce9e40f..659ffb8 100644
--- a/build2/config/utility.txx
+++ b/build2/config/utility.txx
@@ -17,8 +17,7 @@ namespace build2
               bool def_ovr,
               uint64_t save_flags)
     {
-      // Note: see also the other required() version if changing anything
-      // here.
+      // Note: see also omitted() if changing anything here.
 
       if (current_mif->id == configure_id)
         save_variable (root, var, save_flags);
-- 
cgit v1.1