Merge branch 'v0.22.x'

2021-05-26 11:57:41 +02:00
parent 8a9d678bac 7a6823dcdf
commit d2bd12822f
9 changed files with 92 additions and 39 deletions
--- a/src/lib/sqlite/meson.build
+++ b/src/lib/sqlite/meson.build
@@ -1,5 +1,7 @@
 if enable_database
-  sqlite_dep = dependency('sqlite3', version: '>= 3.7.3', required: get_option('sqlite'))
+  sqlite_dep = dependency('sqlite3', version: '>= 3.7.3',
+                          fallback: ['sqlite3', 'sqlite3_dep'],
+                          required: get_option('sqlite'))
 else
  sqlite_dep = dependency('', required: false)
 endif
@@ -21,4 +23,7 @@ sqlite = static_library(

 sqlite_dep = declare_dependency(
  link_with: sqlite,
+  dependencies: [
+    sqlite_dep,
+  ],
 )