From 7ed801cb269bcf731011e283da1bd65ce862be1d Mon Sep 17 00:00:00 2001 From: dgsga <181612+dgsga@users.noreply.github.com> Date: Sat, 2 Mar 2024 20:56:39 +0000 Subject: [PATCH] Update meson.build --- meson.build | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/meson.build b/meson.build index 4e8361fcbe..5755110b46 100644 --- a/meson.build +++ b/meson.build @@ -1204,41 +1204,42 @@ endif # Check whether BDB daemon needs to be compiled # +cnid_backends = '' + # Determine whether or not to use Database Daemon CNID backend -dbd_backend = ' dbd' if not get_option('with-cnid-dbd-backend') use_dbd_backend = false else use_dbd_backend = true + cnid_backends += ' dbd' cdata.set('CNID_BACKEND_DBD', 1) endif # Determine whether or not to use LAST DID scheme -last_backend = ' last' - if not get_option('with-cnid-last-backend') use_last_backend = false else use_last_backend = true + cnid_backends += ' last' cdata.set('CNID_BACKEND_LAST', 1) endif # Check for mysql CNID backend -mysql_backend = ' mysql' mysqlclient = dependency('mysqlclient', required: false) if not mysqlclient.found() use_mysql_backend = false else + cnid_backends += ' mysql' use_mysql_backend = true cdata.set('CNID_BACKEND_MYSQL', 1) endif -cnid_backends = '"' + dbd_backend + last_backend + mysql_backend + '"' -cdata.set('compiled_backends', cnid_backends) +compiled_backends = '"' + cnid_backends + '"' +cdata.set('compiled_backends', compiled_backends) # Determine default CNID backend @@ -1256,9 +1257,6 @@ elif default_backend == 'mysql' and not use_mysql_backend ) endif -cnid_backends = '"' + dbd_backend + last_backend + mysql_backend + '"' -cdata.set('compiled_backends', cnid_backends) - # # Check for docbook #