From 1993f7461afd96c12a147d2f5a72fca475cd7b66 Mon Sep 17 00:00:00 2001
From: Jehan <jehan@girinstud.io>
Date: Wed, 5 Apr 2023 16:39:15 +0200
Subject: [PATCH] meson: API binding options transformed to features.

- Lua, Javascript and Python were boolean defaulting to true, which was
  installing them even when not available (and if not installed then, it
  would show warnings at each run). Instead I make them features with
  'auto' as default. In this default, we don't install when the
  interpreters are absent.
- These 3 options can still be forced by setting them to 'enabled' (the
  interpreters are not actually necessary during build).
- Vala behavior stay the same (and unlike other binding, you cannot
  force it since it has a build step); it's only renamed to just "vala"
  for consistency of option naming.
---
 meson.build       | 39 ++++++++++++++++++++-------------------
 meson_options.txt |  9 ++++-----
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/meson.build b/meson.build
index 52d266b7f0..b289fa0eb1 100644
--- a/meson.build
+++ b/meson.build
@@ -876,7 +876,7 @@ if have_heif
   endif
 endif
 
-have_vala = add_languages('vala', required: get_option('vala-plugins'), native: false)
+have_vala = add_languages('vala', required: get_option('vala'), native: false)
 if have_vala
   babl = declare_dependency(
     dependencies: [
@@ -1065,9 +1065,9 @@ python3_minver = '>=3.6'
 python = pythonmod.find_installation('python3')
 message('Found Python @0@'.format(python.language_version()))
 
-have_python = get_option('python')
+have_python = get_option('python').enabled()
 
-if have_python
+if get_option('python').allowed()
   python_found = (
     python.found() and
     python.language_version().version_compare(python3_minver)
@@ -1086,7 +1086,9 @@ if have_python
     python_found = python_found and pygobject_found
   endif
 
-  if not python_found
+  if python_found
+    have_python = true
+  elif have_python
     python_warning = '''
     Python @0@ or PyGObject was not found.
     Python plug-ins will be installed anyway but you should make sure that
@@ -1102,8 +1104,9 @@ endif
 
 ## Javascript
 
-have_javascript = get_option('javascript')
-if have_javascript
+gjs = find_program('gjs', required: get_option('javascript'))
+have_javascript = get_option('javascript').enabled() or (gjs.found() and get_option('javascript').auto())
+if not gjs.found() and have_javascript
   gjs = find_program('gjs', required: false)
   if not gjs.found()
     js_warning = '''
@@ -1119,19 +1122,17 @@ endif
 
 ## Lua
 
-have_lua = get_option('lua')
-if have_lua
-  lua = find_program('luajit', required: false)
-  if not lua.found()
-    lua_warning = '''
-    Luajit was not found.
-    Lua plug-ins will be installed anyway but you should make sure that
-    luajit and LGI are available at installation, otherwise
-    installed plug-ins won't be usable.
-    '''
-    warning(lua_warning)
-    warnings += lua_warning
-  endif
+lua = find_program('luajit', required: get_option('lua'))
+have_lua = get_option('lua').enabled() or (lua.found() and get_option('lua').auto())
+if not lua.found() and have_lua
+  lua_warning = '''
+  Luajit was not found.
+  Lua plug-ins will be installed anyway but you should make sure that
+  luajit and LGI are available at installation, otherwise
+  installed plug-ins won't be usable.
+  '''
+  warning(lua_warning)
+  warnings += lua_warning
 endif
 
 
diff --git a/meson_options.txt b/meson_options.txt
index 1d7194c847..08355c4af9 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -59,8 +59,7 @@ option('g-ir-doc',          type: 'boolean', value: false,  description: 'Build
 option('linux-input',       type: 'feature', value: 'auto', description: 'Linux input event controller module')
 option('vector-icons',      type: 'boolean', value: true,   description: 'Use vector icons rather than raster ones')
 
-option('vala-plugins',      type: 'feature', value: 'auto', description: 'Build VAPI and Vala plugins')
-
-option('javascript',        type: 'boolean', value: true,   description: 'Install Javascript plug-ins')
-option('lua',               type: 'boolean', value: true,   description: 'Install Lua plug-ins')
-option('python',            type: 'boolean', value: true,   description: 'Install Python 3 plug-ins')
+option('vala',              type: 'feature', value: 'auto', description: 'Build VAPI and Vala plugins')
+option('javascript',        type: 'feature', value: 'auto', description: 'Install Javascript plug-ins')
+option('lua',               type: 'feature', value: 'auto', description: 'Install Lua plug-ins')
+option('python',            type: 'feature', value: 'auto', description: 'Install Python 3 plug-ins')