4 files changed, 15 insertions, 11 deletions
diff --git a/src/merchant-tools/Makefile.am b/src/merchant-tools/Makefile.am
index 21ddb89a..efa2fa7a 100644
--- a/src/merchant-tools/Makefile.am
+++ b/src/merchant-tools/Makefile.am
@@ -24,6 +24,7 @@ taler_merchant_benchmark_LDADD = \
   $(top_srcdir)/src/backenddb/libtalermerchantdb.la \
   $(top_srcdir)/src/lib/libtalermerchant.la \
   $(top_srcdir)/src/testing/libtalermerchanttesting.la \
+  $(top_srcdir)/src/util/libtalermerchantutil.la \
   $(LIBGCRYPT_LIBS) \
   -ltalertesting \
   -ltalerfakebank \
@@ -42,6 +43,7 @@ taler_merchant_dbinit_SOURCES = \
 taler_merchant_dbinit_LDADD = \
   $(LIBGCRYPT_LIBS) \
   $(top_builddir)/src/backenddb/libtalermerchantdb.la \
+  $(top_srcdir)/src/util/libtalermerchantutil.la \
   -ltalerutil \
   -ltalerpq \
   -lgnunetutil \
@@ -52,6 +54,7 @@ taler_merchant_passwd_SOURCES = \
 taler_merchant_passwd_LDADD = \
   $(LIBGCRYPT_LIBS) \
   $(top_builddir)/src/backenddb/libtalermerchantdb.la \
+  $(top_srcdir)/src/util/libtalermerchantutil.la \
   -ltalerutil \
   -ltalerpq \
   -lgnunetutil \
diff --git a/src/merchant-tools/taler-merchant-benchmark.c b/src/merchant-tools/taler-merchant-benchmark.c
index 238b9f03..63a7a7f6 100644
--- a/src/merchant-tools/taler-merchant-benchmark.c
+++ b/src/merchant-tools/taler-merchant-benchmark.c
@@ -25,6 +25,7 @@
 #include "platform.h"
 #include <taler/taler_util.h>
 #include <taler/taler_testing_lib.h>
+#include "taler_merchant_util.h"
 #include "taler_merchant_testing_lib.h"
 
 
@@ -407,6 +408,7 @@ main (int argc,
       &use_fakebank),
     GNUNET_GETOPT_option_version (PACKAGE_VERSION " " VCS_VERSION),
     GNUNET_GETOPT_option_help (
+      TALER_MERCHANT_project_data (),
       "Runs benchmark logic against merchant backend. "
       "Must be used with either 'ordinary' or 'corner' sub-commands."),
     GNUNET_GETOPT_option_string (
@@ -431,7 +433,9 @@ main (int argc,
       "fakebank",
       "use fakebank for the banking system",
       &use_fakebank),
-    GNUNET_GETOPT_option_help ("Populate databases with corner case payments"),
+    GNUNET_GETOPT_option_help (
+      TALER_MERCHANT_project_data (),
+      "Populate databases with corner case payments"),
     GNUNET_GETOPT_option_string (
       'l',
       "logfile",
@@ -480,6 +484,7 @@ main (int argc,
       "use fakebank for the banking system",
       &use_fakebank),
     GNUNET_GETOPT_option_help (
+      TALER_MERCHANT_project_data (),
       "Generate Taler ordinary payments"
       " to populate the databases"),
     GNUNET_GETOPT_option_string (
@@ -500,7 +505,7 @@ main (int argc,
   };
   const char *default_config_file;
 
-  default_config_file = GNUNET_OS_project_data_get ()->user_config_file;
+  default_config_file = TALER_MERCHANT_project_data ()->user_config_file;
   options = root_options;
   if (NULL != argv[1])
   {
@@ -552,7 +557,7 @@ main (int argc,
   {
     struct GNUNET_CONFIGURATION_Handle *cfg;
 
-    cfg = GNUNET_CONFIGURATION_create ();
+    cfg = GNUNET_CONFIGURATION_create (TALER_MERCHANT_project_data ());
     if (GNUNET_OK !=
         GNUNET_CONFIGURATION_load (cfg,
                                    cfg_filename))
diff --git a/src/merchant-tools/taler-merchant-dbinit.c b/src/merchant-tools/taler-merchant-dbinit.c
index aaabdcbe..5fb2d3ab 100644
--- a/src/merchant-tools/taler-merchant-dbinit.c
+++ b/src/merchant-tools/taler-merchant-dbinit.c
@@ -22,6 +22,7 @@
 #include "platform.h"
 #include <taler/taler_util.h>
 #include <gnunet/gnunet_util_lib.h>
+#include "taler_merchant_util.h"
 #include "taler_merchantdb_lib.h"
 
 
@@ -106,11 +107,8 @@ main (int argc,
   };
   enum GNUNET_GenericReturnValue ret;
 
-  /* force linker to link against libtalerutil; if we do
-     not do this, the linker may "optimize" libtalerutil
-     away and skip #TALER_OS_init(), which we do need */
-  (void) TALER_project_data_default ();
   ret = GNUNET_PROGRAM_run (
+    TALER_MERCHANT_project_data (),
     argc, argv,
     "taler-merchant-dbinit",
     gettext_noop ("Initialize Taler merchant database"),
diff --git a/src/merchant-tools/taler-merchant-passwd.c b/src/merchant-tools/taler-merchant-passwd.c
index 5f061d89..f2ba9649 100644
--- a/src/merchant-tools/taler-merchant-passwd.c
+++ b/src/merchant-tools/taler-merchant-passwd.c
@@ -22,6 +22,7 @@
 #include <taler/taler_util.h>
 #include <taler/taler_dbevents.h>
 #include <gnunet/gnunet_util_lib.h>
+#include "taler_merchant_util.h"
 #include "taler_merchantdb_lib.h"
 #include "taler_merchantdb_lib.h"
 
@@ -171,11 +172,8 @@ main (int argc,
   };
   enum GNUNET_GenericReturnValue ret;
 
-  /* force linker to link against libtalerutil; if we do
-     not do this, the linker may "optimize" libtalerutil
-     away and skip #TALER_OS_init(), which we do need */
-  (void) TALER_project_data_default ();
   ret = GNUNET_PROGRAM_run (
+    TALER_MERCHANT_project_data (),
     argc, argv,
     "taler-merchant-passwd",
     gettext_noop ("Reset instance password"),