From f0a796a3f6d4329555506b3464b6d174f53fd9cf Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Thu, 16 Aug 2018 14:22:01 +0200
Subject: make curl check saner, use AS_IF

---
 src/benchmark/benchmark.conf                              | 10 +++++-----
 .../exchange_benchmark_home/.config/taler/account-2.json  |  4 ++--
 src/wire-plugins/Makefile.am                              | 15 +++++++++++----
 src/wire-plugins/test_wire_plugin.c                       |  2 ++
 4 files changed, 20 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/benchmark/benchmark.conf b/src/benchmark/benchmark.conf
index bcb083dc8..045cc0a27 100644
--- a/src/benchmark/benchmark.conf
+++ b/src/benchmark/benchmark.conf
@@ -85,7 +85,7 @@ fee_withdraw = EUR:0.00
 fee_deposit = EUR:0.00
 fee_refresh = EUR:0.01
 fee_refund = EUR:0.01
-rsa_keysize = 1024
+rsa_keysize = 2048
 
 [coin_eur_ct_10]
 value = EUR:0.10
@@ -97,7 +97,7 @@ fee_withdraw = EUR:0.01
 fee_deposit = EUR:0.01
 fee_refresh = EUR:0.03
 fee_refund = EUR:0.01
-rsa_keysize = 1024
+rsa_keysize = 2048
 
 [coin_eur_1]
 value = EUR:1
@@ -109,7 +109,7 @@ fee_withdraw = EUR:0.01
 fee_deposit = EUR:0.01
 fee_refresh = EUR:0.03
 fee_refund = EUR:0.01
-rsa_keysize = 1024
+rsa_keysize = 2048
 
 [coin_eur_5]
 value = EUR:5
@@ -121,7 +121,7 @@ fee_withdraw = EUR:0.01
 fee_deposit = EUR:0.01
 fee_refresh = EUR:0.03
 fee_refund = EUR:0.01
-rsa_keysize = 1024
+rsa_keysize = 2048
 
 [coin_eur_10]
 value = EUR:10
@@ -133,4 +133,4 @@ fee_withdraw = EUR:0.01
 fee_deposit = EUR:0.01
 fee_refresh = EUR:0.03
 fee_refund = EUR:0.01
-rsa_keysize = 1024
+rsa_keysize = 2048
diff --git a/src/benchmark/exchange_benchmark_home/.config/taler/account-2.json b/src/benchmark/exchange_benchmark_home/.config/taler/account-2.json
index b56d7c9cc..a99f114f0 100644
--- a/src/benchmark/exchange_benchmark_home/.config/taler/account-2.json
+++ b/src/benchmark/exchange_benchmark_home/.config/taler/account-2.json
@@ -1,5 +1,5 @@
 {
   "url": "payto://x-taler-bank/localhost:8082/2",
-  "salt": "RJG7PDRM3YFFQ9YXHE5034R2HF9X68PQKC2W0CQWV4BQ50RYQT339GWN33601S53C3GGG35DG9C6479H4PGMZ9SVJ7A22RK99S4BN78",
-  "master_sig": "H9GKSPFDQVCP8NBW0X4ZMWEFHZGZNTWZETWRTMYK3831HYTDKWR7R5KY2YJ7XW6HNZ27Q9NXW2DGJWJ016WBK01AKWA6MRNFVPQ6G2G"
+  "salt": "121B05SK5B4P0ZXQ748G3HCXA35W3QYQ6KP799TEMSJSVYHCG5CNZWY2CYD5RN4QHYBFWM1M8973W3X9PBKW78D49QV4D7NT7PEE040",
+  "master_sig": "WJWQBR8M0M9CENCBZVRDT2D6YMCD1AYN1JS54KX0Q7VRMS163800GP25871Y96T0TPF1SN1CPR6TE3KG4VZXW8HJPENVC8PAK01S218"
 }
\ No newline at end of file
diff --git a/src/wire-plugins/Makefile.am b/src/wire-plugins/Makefile.am
index 9f6029d7f..393bfb1b8 100644
--- a/src/wire-plugins/Makefile.am
+++ b/src/wire-plugins/Makefile.am
@@ -18,8 +18,17 @@ EXTRA_DIST = \
 plugindir = $(libdir)/taler
 
 plugin_LTLIBRARIES = \
-  libtaler_plugin_wire_ebics.la \
-  libtaler_plugin_wire_taler_bank.la
+  libtaler_plugin_wire_ebics.la
+
+if HAVE_LIBCURL
+plugin_LTLIBRARIES += \
+ libtaler_plugin_wire_taler_bank.la
+else
+if HAVE_LIBGNURL
+plugin_LTLIBRARIES += \
+ libtaler_plugin_wire_taler_bank.la
+endif
+endif
 
 noinst_LTLIBRARIES = \
   libtaler_plugin_wire_template.la
@@ -44,9 +53,7 @@ libtaler_plugin_wire_ebics_la_LIBADD = \
   $(LTLIBINTL)
 libtaler_plugin_wire_ebics_la_LDFLAGS = \
   $(TALER_PLUGIN_LDFLAGS) \
-  $(top_builddir)/src/json/libtalerjson.la \
   $(top_builddir)/src/util/libtalerutil.la \
-  -lgnunetjson \
   -lgnunetutil $(XLIB)
 
 
diff --git a/src/wire-plugins/test_wire_plugin.c b/src/wire-plugins/test_wire_plugin.c
index 0e149dde7..0bb7571f4 100644
--- a/src/wire-plugins/test_wire_plugin.c
+++ b/src/wire-plugins/test_wire_plugin.c
@@ -64,12 +64,14 @@ static struct TestBlock tests[] = {
     .round_out = "EUR:0.12",
     .currency = "EUR"
   },
+#if HAVE_LIBCURL
   {
     .plugin_name = "taler_bank",
     .round_in = "KUDOS:0.123456",
     .round_out = "KUDOS:0.12",
     .currency = "KUDOS"
   },
+#endif
   {
     NULL, NULL, NULL, NULL
   }
-- 
cgit v1.2.3