[taler-merchant] branch master updated (a2ba9b3b -> dcc4a4d2)

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a change to branch master
in repository merchant.

    from a2ba9b3b rename fest: remove 'P' suffixes from non-packable structures
     new fbcb997a make tests build
     new dcc4a4d2 read templates from merchant project data

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/backend/taler-merchant-httpd.c | 2 +-
 src/testing/Makefile.am            | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/backend/taler-merchant-httpd.c 
b/src/backend/taler-merchant-httpd.c
index 34bed4ad..66125bad 100644
--- a/src/backend/taler-merchant-httpd.c
+++ b/src/backend/taler-merchant-httpd.c
@@ -2319,7 +2319,7 @@ run (void *cls,
                                             "FORCE_AUDIT"))
     TMH_force_audit = GNUNET_YES;
   if (GNUNET_OK !=
-      TALER_TEMPLATING_init (TALER_EXCHANGE_project_data ()))
+      TALER_TEMPLATING_init (TALER_MERCHANT_project_data ()))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Failed to setup templates\n");
diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index 67bbbced..b087f070 100644
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -123,6 +123,7 @@ test_merchant_api_twisted_cs_SOURCES = \
 test_merchant_api_twisted_cs_LDADD = \
   $(top_srcdir)/src/backenddb/libtalermerchantdb.la \
   $(top_srcdir)/src/lib/libtalermerchant.la \
+  $(top_srcdir)/src/util/libtalermerchantutil.la \
   $(LIBGCRYPT_LIBS) \
   -ltalertesting \
   -ltalermerchanttesting \
@@ -144,6 +145,7 @@ test_merchant_api_twisted_rsa_SOURCES = \
 test_merchant_api_twisted_rsa_LDADD = \
   $(top_srcdir)/src/backenddb/libtalermerchantdb.la \
   $(top_srcdir)/src/lib/libtalermerchant.la \
+  $(top_srcdir)/src/util/libtalermerchantutil.la \
   $(LIBGCRYPT_LIBS) \
   -ltalertesting \
   -ltalermerchanttesting \
@@ -166,6 +168,7 @@ test_merchant_api_cs_LDADD = \
   libtalermerchanttesting.la \
   $(top_srcdir)/src/backenddb/libtalermerchantdb.la \
   $(top_srcdir)/src/lib/libtalermerchant.la \
+  $(top_srcdir)/src/util/libtalermerchantutil.la \
   $(LIBGCRYPT_LIBS) \
   -ltalertesting \
   -ltalerfakebank \
@@ -183,6 +186,7 @@ test_merchant_api_rsa_SOURCES = \
   test_merchant_api.c
 test_merchant_api_rsa_LDADD = \
   libtalermerchanttesting.la \
+  $(top_srcdir)/src/util/libtalermerchantutil.la \
   $(top_srcdir)/src/backenddb/libtalermerchantdb.la \
   $(top_srcdir)/src/lib/libtalermerchant.la \
   $(LIBGCRYPT_LIBS) \
@@ -202,6 +206,7 @@ test_kyc_api_SOURCES = \
   test_kyc_api.c
 test_kyc_api_LDADD = \
   libtalermerchanttesting.la \
+  $(top_srcdir)/src/util/libtalermerchantutil.la \
   $(top_srcdir)/src/backenddb/libtalermerchantdb.la \
   $(top_srcdir)/src/lib/libtalermerchant.la \
   $(LIBGCRYPT_LIBS) \

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.