From f0a796a3f6d4329555506b3464b6d174f53fd9cf Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Thu, 16 Aug 2018 14:22:01 +0200 Subject: make curl check saner, use AS_IF --- src/wire-plugins/Makefile.am | 15 +++++++++++---- src/wire-plugins/test_wire_plugin.c | 2 ++ 2 files changed, 13 insertions(+), 4 deletions(-) (limited to 'src/wire-plugins') 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