Fix issues related to utils & libutils

Fix dependency issues related to libutils, wrong use of libutils_enabled. Signed-off-by: Tomi Valkeinen <[email protected]>
tomba · Oct 6, 2023 · 8191ab3 · 8191ab3
1 parent b91affd
commit 8191ab3
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/meson.build b/meson.build
@@ -47,7 +47,7 @@ summary({
             'kms++utils library': libutils_enabled,
             'Python bindings': pybindings_enabled,
             'kmscube': kmscube_enabled,
-            'Utilities': libutils_enabled,
+            'Utilities': utils_enabled,
         },
         section : 'Configuration',
         bool_yn : true)
diff --git a/py/pykms/meson.build b/py/pykms/meson.build
@@ -1,3 +1,10 @@
+
+# Python bindings require libutils for now.
+if not get_option('libutils')
+    pybindings_enabled = false
+    subdir_done()
+endif
+
 py3_dep = dependency('python3', required : get_option('pykms'))
 
 if py3_dep.found() == false

diff --git a/utils/meson.build b/utils/meson.build
@@ -1,7 +1,15 @@
+if not get_option('utils')
+    utils_enabled = false
+    subdir_done()
+endif
+
 if not get_option('libutils')
-    error('"utils" option requires "libutils" option enabled')
+    utils_enabled = false
+    subdir_done()
 endif
 
+utils_enabled = true
+
 common_deps = [ libkmsxx_dep, libkmsxxutil_dep, libfmt_dep ]
 
 libevdev_dep = dependency('libevdev', required : false)