exchange

commit 4869bc9ac5ed35ed9dec46387be266f0b0b7be88
parent c361a889d6093c85d02e0a80c79acc008774a4b5
Author: Christian Grothoff <grothoff@gnunet.org>
Date:   Fri, 10 Apr 2026 12:46:35 +0200

dep fixes

Diffstat:
D
src/auditordb/auditordb_plugin.c
 | 
88
-------------------------------------------------------------------------------
M
src/auditordb/meson.build
 | 
6
+++++-
M
src/exchangedb/meson.build
 | 
10
+++++++---

3 files changed, 12 insertions(+), 92 deletions(-)
diff --git a/src/auditordb/auditordb_plugin.c b/src/auditordb/auditordb_plugin.c
@@ -1,88 +0,0 @@
-/*
-  This file is part of TALER
-  Copyright (C) 2015, 2016 Taler Systems SA
-
-  TALER is free software; you can redistribute it and/or modify it under the
-  terms of the GNU General Public License as published by the Free Software
-  Foundation; either version 3, or (at your option) any later version.
-
-  TALER is distributed in the hope that it will be useful, but WITHOUT ANY
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-  A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License along with
-  TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
-*/
-/**
- * @file auditordb/auditordb_plugin.c
- * @brief Logic to load database plugin
- * @author Christian Grothoff
- * @author Sree Harsha Totakura <sreeharsha@totakura.in>
- */
-#include "taler/taler_auditordb_lib.h"
-#include <ltdl.h>
-
-
-struct TALER_AUDITORDB_Plugin *
-TALER_AUDITORDB_plugin_load (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                             bool skip_preflight)
-{
-  char *plugin_name;
-  char *lib_name;
-  struct TALER_AUDITORDB_Plugin *plugin;
-
-  if (GNUNET_SYSERR ==
-      GNUNET_CONFIGURATION_get_value_string (cfg,
-                                             "auditor",
-                                             "db",
-                                             &plugin_name))
-  {
-    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               "auditor",
-                               "db");
-    return NULL;
-  }
-  (void) GNUNET_asprintf (&lib_name,
-                          "libtaler_plugin_auditordb_%s",
-                          plugin_name);
-  GNUNET_free (plugin_name);
-  plugin = GNUNET_PLUGIN_load (TALER_AUDITOR_project_data (),
-                               lib_name,
-                               (void *) cfg);
-  if (NULL == plugin)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to load `%s'\n",
-                lib_name);
-    GNUNET_free (lib_name);
-    return NULL;
-  }
-  plugin->library_name = lib_name;
-  if ( (! skip_preflight) &&
-       (GNUNET_OK !=
-        plugin->preflight (plugin->cls)) )
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Database not ready. Try running taler-auditor-dbinit!\n");
-    TALER_AUDITORDB_plugin_unload (plugin);
-    return NULL;
-  }
-  return plugin;
-}
-
-
-void
-TALER_AUDITORDB_plugin_unload (struct TALER_AUDITORDB_Plugin *plugin)
-{
-  char *lib_name;
-
-  if (NULL == plugin)
-    return;
-  lib_name = plugin->library_name;
-  GNUNET_assert (NULL == GNUNET_PLUGIN_unload (lib_name,
-                                               plugin));
-  GNUNET_free (lib_name);
-}
-
-
-/* end of auditordb_plugin.c */
diff --git a/src/auditordb/meson.build b/src/auditordb/meson.build
@@ -31,7 +31,6 @@ configure_file(
 libtalerauditordb = library(
     'talerauditordb',
     [
-        'auditordb_plugin.c',
         'create_tables.c',
         'del_denomination_balance.c',
         'delete_auditor_closure_lag.c',
@@ -132,7 +131,9 @@ libtalerauditordb = library(
     version: solibversions['libtalerauditordb']['soversion'],
     install_rpath: rpath_option,
     dependencies: [
+         libtalerpq_dep,
          libtalerutil_dep,
+         gnunetpq_dep,
          gnunetutil_dep,
          pq_dep,
     ],
@@ -158,8 +159,10 @@ test_auditordb_checkpoints = executable(
     dependencies: [
         libtalerutil_dep,
         libtalerpq_dep,
+        gnunetpq_dep,
         gnunetutil_dep,
         libtalerauditordb_dep,
+        pq_dep,
     ],
     include_directories: [incdir, configuration_inc],
     install: false,
@@ -184,6 +187,7 @@ test_auditordb = executable(
         libtalerpq_dep,
         gnunetutil_dep,
         libtalerauditordb_dep,
+        pq_dep,
     ],
     include_directories: [incdir, configuration_inc],
     install: false,
diff --git a/src/exchangedb/meson.build b/src/exchangedb/meson.build
@@ -293,12 +293,15 @@ libtalerexchangedb = library(
     dependencies: [
         libtalerbank_dep,
         libtalerkyclogic_dep,
+        libtalerpq_dep,
         libtalerjson_dep,
         libtalerutil_dep,
-        gnunetutil_dep,
+        gnunetpq_dep,
         gnunetjson_dep,
+        gnunetutil_dep,
         json_dep,
         curl_dep,
+        pq_dep,
     ],
     include_directories: [incdir, configuration_inc],
     install: true,
@@ -328,6 +331,7 @@ pkg.generate(
 #        libtalerpq_dep,
 #        gnunetutil_dep,
 #        gnunetjson_dep,
+#        pq_dep,
 #        json_dep,
 #    ],
 #    include_directories: [incdir, configuration_inc],
@@ -340,10 +344,10 @@ executable(
     ['bench_db.c'],
     install_rpath: rpath_option,
     dependencies: [
-        libtalerutil_dep,
         libtalerpq_dep,
-        gnunetutil_dep,
+        libtalerutil_dep,
         gnunetpq_dep,
+        gnunetutil_dep,
         pq_dep,
     ],
     include_directories: [incdir, configuration_inc],