Meson: Refactor sqlite3 handling for module-gsqlite3

diff --git a/meson.build b/meson.build
index 918c4f5cd047304bacff68c34617aa1249552e62..9ca9b29ed50b0b7dd76b14364934c835fe798d71 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -72,6 +72,7 @@ subdir('meson' / 'socket-dir')              # Socket Dir
 subdir('meson' / 'various-functions')       # Various Functions
 subdir('meson' / 'various-headers')         # Various Headers
 subdir('meson' / 'yaml-cpp')                # YAML C++
+subdir('meson' / 'sqlite3')                 # Sqlite3
 
 # Manpages
 # if not fs.exists('docs' / 'pdns_server.1') and not python_have_venv
@@ -119,6 +120,7 @@ deps = [
   dep_protozero,
   dep_yahttp,
   dep_yaml_cpp,
+  dep_sqlite3,
 ]
 
 # Modules
@@ -128,7 +130,6 @@ all_modules = {
   'gmysql':   {'deps': ['mysql'],                       'exts': []},
   'godbc':    {'deps': ['odbc'],                        'exts': []},
   'gpgsql':   {'deps': ['pgsql'],                       'exts': []},
-  'gsqlite3': {'deps': ['sqlite3'],                     'exts': []},
   'ldap':     {'deps': ['ldap'],                        'exts': []},
   'lua2':     {'deps': [],                              'exts': []},
   'remote':   {'deps': ['prog-curl', 'zeromq'],         'exts': []},
@@ -163,9 +164,6 @@ foreach module_name, module_props: all_modules
   endforeach
 endforeach
 
-# Add the sqlite3 dependency for the bind and gsqlite3 backends and pdnsutil.
-deps += get_variable('dep_sqlite3', dependency('', required: false))
-
 subdir('pdns')
 
 selected_modules = []

diff --git a/meson/sqlite3/meson.build b/meson/sqlite3/meson.build
index e69f4117a9bcdb8fef70d4a25a2079362d183fad..cbad2265f376fd08f501f24633208db281b52b4e 100644 (file)
--- a/meson/sqlite3/meson.build
+++ b/meson/sqlite3/meson.build
@@ -1,10 +1,13 @@
-dep_sqlite3 = dependency('sqlite3', required: true)
+dep_sqlite3 = dependency('', required: false)
+
+if get_option('module-gsqlite3') != 'disabled'
+  dep_sqlite3 = dependency('sqlite3', required: true)
+endif
 
 conf.set('HAVE_SQLITE3', dep_sqlite3.found(), description: 'Sqlite3')
 conf.set('SQLITE3', dep_sqlite3.found(), description: 'Sqlite3')
 
 summary('SQLite3', dep_sqlite3.found(), bool_yn: true, section: 'SQLite3')
-
 if dep_sqlite3.found()
   summary('Version', dep_sqlite3.version(), section: 'SQLite3')
 endif

diff --git a/pdns/meson.build b/pdns/meson.build
index b8b80a9923d6c9d454521417887253ee9b709b88..54146e22783265f480ef08082343235c191bd5d2 100644 (file)
--- a/pdns/meson.build
+++ b/pdns/meson.build
@@ -155,7 +155,7 @@ conditional_sources = {
   'ssqlite3': {
     'sources': ['ssqlite3.cc'],
     'headers': ['ssqlite3.hh'],
-    'condition': get_variable('dep_sqlite3', dependency('', required: false)).found(),
+    'condition': dep_sqlite3.found(),
   },
   'minicurl': {
     'sources': ['minicurl.cc'],