From: Fred Morcos <fred.morcos@open-xchange.com>
Date: Fri, 18 Aug 2023 22:17:04 +0000 (+0200)
Subject: Meson: Cleanup the mysql dependency detection
X-Git-Tag: rec-5.1.0-alpha1~80^2~185
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a642a067ac1cfbc738fe91e737ce3f31ff094a7;p=thirdparty%2Fpdns.git

Meson: Cleanup the mysql dependency detection
---

diff --git a/meson/mysql/meson.build b/meson/mysql/meson.build
index 052425ca05..36d6430a03 100644
--- a/meson/mysql/meson.build
+++ b/meson/mysql/meson.build
@@ -1,12 +1,9 @@
-# MySQL
-# Outputs: deps_mysql
-
-deps_mysql = dependency('libmysql', required: false)
-if not deps_mysql.found()
-  deps_mysql = dependency('libmariadb', required: false)
+dep_mysql = dependency('libmysql', required: false)
+if not dep_mysql.found()
+  dep_mysql = dependency('libmariadb', required: false)
 endif
 
-if not deps_mysql.found()
+if not dep_mysql.found()
   mysql_config = find_program('mysql_config', required: false)
   if not mysql_config.found()
     mysql_config = find_program('mariadb_config', required: true)
@@ -21,8 +18,15 @@ if not deps_mysql.found()
   mysql_version_res = run_command(mysql_config, '--cc_version', check: true)
   mysql_version = mysql_version_res.stdout().strip()
 
-  deps_mysql = declare_dependency(compile_args: mysql_cflags, link_args: mysql_ldflags, version: mysql_version)
+  dep_mysql = declare_dependency(
+    compile_args: mysql_cflags,
+    link_args: mysql_ldflags,
+    version: mysql_version,
+  )
 endif
 
-summary('MySQL/MariaDB', deps_mysql.found(), bool_yn: true, section: 'Configuration')
-summary('MySQL/MariaDB Version', deps_mysql.version(), section: 'Configuration')
+summary('MySQL/MariaDB', dep_mysql.found(), bool_yn: true, section: 'MySQL')
+
+if dep_mysql.found()
+  summary('Version', dep_mysql.version(), section: 'MySQL')
+endif