From: Fred Morcos <fred.morcos@open-xchange.com>
Date: Wed, 16 Aug 2023 13:21:17 +0000 (+0200)
Subject: Meson: Cleanup python and venv module
X-Git-Tag: rec-5.1.0-alpha1~80^2~199
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=65b90677cfb3271abc7171418ecbef732830e844;p=thirdparty%2Fpdns.git

Meson: Cleanup python and venv module
---

diff --git a/meson/python-venv/meson.build b/meson/python-venv/meson.build
index 5f702d55a9..be4538e7d9 100644
--- a/meson/python-venv/meson.build
+++ b/meson/python-venv/meson.build
@@ -1,29 +1,29 @@
-# Python Venv
-# Outputs: python_have_venv
-
 python_have_venv = false
 
-dep_python = dependency('python3', version: '>= 3.6', required: false)
-if not dep_python.found()
+dep_python_prog = dependency('python3', version: '>= 3.6', required: false)
+if not dep_python_prog.found()
   warning('Python3 dependency not found')
+  summary('Python', dep_python_prog.found(), bool_yn: true, section: 'Python')
   subdir_done()
 endif
 
-summary('Python', dep_python.found(), bool_yn: true, section: 'Configuration')
-summary('Python Version', dep_python.version(), section: 'Configuration')
+summary('Python', dep_python_prog.found(), bool_yn: true, section: 'Python')
+summary('Implementation', dep_python_prog.name(), section: 'Python')
+summary('Version', dep_python_prog.version(), section: 'Python')
 
-python_prog = 'python' + dep_python.version()
-python_prog = find_program(python_prog, required: false)
+python_prog_name = 'python' + dep_python_prog.version()
+python_prog = find_program(python_prog_name, required: false)
 if not python_prog.found()
-  warning('Python3 program not found')
+  warning(python_prog_name + ' program not found')
   subdir_done()
 endif
 
 python_prog_res = run_command(python_prog, '-c', '"import venv"', check: false)
 if python_prog_res.returncode() != 0
-  warning('Python3 venv module not found')
+  warning(python_prog_name + ' venv module not found')
+  summary('Python venv', false, bool_yn: true, section: 'Python')
   subdir_done()
 endif
 
 python_have_venv = true
-summary('Python venv', python_have_venv, bool_yn: true, section: 'Configuration')
+summary('Have venv', python_have_venv, bool_yn: true, section: 'Python')