commit 5c6a693e7d82db01d7a17cdfbbd0c0393db04ae9
author Patrick Williams <patrick@stwcx.xyz> Wed Nov 29 06:44:29 2023 -0600
committer Shawn McCarney <shawnmm@us.ibm.com> Mon Dec 04 17:11:42 2023 +0000
tree 334173a1c8b67a541236e73e6c3f08bc9263b034
parent c6afbbc8c1140e6f801b06194a3a22bbe7cb23a1

build: use allowed over enabled

Meson feature options are typically in a tri-state of enabled, disabled,
or auto.  The enabled and disabled functions on an option (from
`get_option`) no longer return true for auto features.  Instead, the
expectation is to use `allowed()` which is true for both enabled and auto.

Switch all uses of `enabled` to `allowed`.

Change-Id: I37fcb391dcb215a86a60c26f7512f6ccb8312dc4
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>

phosphor-power-supply/meson.build

diff --git a/phosphor-power-supply/meson.build b/phosphor-power-supply/meson.build
index 3b4a052..35034b3 100644
--- a/phosphor-power-supply/meson.build
+++ b/phosphor-power-supply/meson.build
@@ -27,6 +27,6 @@
 
 power_supply = phosphor_psu_monitor.extract_objects('power_supply.cpp')
 
-if get_option('tests').enabled()
+if get_option('tests').allowed()
   subdir('test')
 endif

phosphor-power-supply/test/meson.build

diff --git a/phosphor-power-supply/test/meson.build b/phosphor-power-supply/test/meson.build
index 1e5fe05..86143aa 100644
--- a/phosphor-power-supply/test/meson.build
+++ b/phosphor-power-supply/test/meson.build
@@ -21,7 +21,7 @@
                 link_with: [
                   libpower,
                   ],
-                build_rpath: get_option('oe-sdk').enabled() ? rpath : '',
+                build_rpath: get_option('oe-sdk').allowed() ? rpath : '',
                 objects: power_supply,
      )
 )