From 7d9735e51ef25f6a6d0d3deff41864646f4a8b47 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 1 Jan 2025 07:03:22 +0200 Subject: [PATCH 29/29] Meson: Find mariadb also by name libmariadb See RM #1204 Signed-off-by: Marko Lindqvist --- meson.build | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 21fba60b79..cbdc6475c6 100644 --- a/meson.build +++ b/meson.build @@ -1039,7 +1039,11 @@ if get_option('fcdb').contains('mariadb') fcdb_src = [ fcdb_src, 'dependencies/luasql/src/ls_mysql.c', ] - fcdb_dep = [ fcdb_dep, dependency('mariadb') ] + mdb_dep = dependency('mariadb', required: false) + if not mdb_dep.found() + mdb_dep = dependency('libmariadb') + endif + fcdb_dep = [ fcdb_dep, mdb_dep ] endif if get_option('fcdb').contains('odbc') -- 2.45.2