merchant

commit 135a9a2faba3abd77221572ed2662a0743e37f6e
parent c6bf45746d2d4e4843058f27fbe5733f1df52130
Author: Christian Grothoff <christian@grothoff.org>
Date:   Sun, 17 Apr 2016 12:22:27 +0200

fix linker flag

Diffstat:
M
copylib/config.php
 | 
2
+-
M
src/backend/taler-merchant-httpd_exchanges.c
 | 
4
++--
M
src/backenddb/Makefile.am
 | 
1
+

3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/copylib/config.php b/copylib/config.php
@@ -17,7 +17,7 @@
 
 $REFUND_DELTA = 'P3M';
 // set to false when done with local tests
-$explicit_currency = "PUDOS";
+$explicit_currency = "KUDOS";
 $MERCHANT_CURRENCY = $explicit_currency;
 
 $host = $_SERVER["HTTP_HOST"];
diff --git a/src/backend/taler-merchant-httpd_exchanges.c b/src/backend/taler-merchant-httpd_exchanges.c
@@ -310,8 +310,8 @@ return_result (void *cls)
  */
 struct TMH_EXCHANGES_FindOperation *
 TMH_EXCHANGES_find_exchange (const char *chosen_exchange,
-                     TMH_EXCHANGES_FindContinuation fc,
-                     void *fc_cls)
+			     TMH_EXCHANGES_FindContinuation fc,
+			     void *fc_cls)
 {
   struct Exchange *exchange;
   struct TMH_EXCHANGES_FindOperation *fo;
diff --git a/src/backenddb/Makefile.am b/src/backenddb/Makefile.am
@@ -34,6 +34,7 @@ libtaler_plugin_merchantdb_postgres_la_LIBADD = \
 libtaler_plugin_merchantdb_postgres_la_LDFLAGS = \
   $(TALER_PLUGIN_LDFLAGS) \
   -lgnunetpq \
+  -ltalerpq \
   -ltalerutil \
   -lpq \
   -lgnunetpostgres \