[taler-sync] branch master updated (96021dd -> fdc5cf4)

[gnunet]

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

grothoff pushed a change to branch master
in repository sync.

    from 96021dd  bump-merge
     new c3c40cb  -config fixes
     new 19a5c87  -config fixes
     new fdc5cf4  -remove libgnurl check

The 3 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:
 configure.ac                   | 34 ++++------------------------------
 src/testing/test_sync_api.c    |  2 +-
 src/testing/test_sync_api.conf | 12 ++++++++++++
 3 files changed, 17 insertions(+), 31 deletions(-)

diff --git a/configure.ac b/configure.ac
index aed3af0..bdab253 100644
--- a/configure.ac
+++ b/configure.ac
@@ -165,16 +165,6 @@ PKG_CHECK_MODULES([JANSSON], [jansson >= 2.3],
 *** You need libjansson to build this program.
 ***]])])
 
-# check for libgnurl
-# libgnurl
-LIBGNURL_CHECK_CONFIG(,7.34.0,gnurl=1,gnurl=0)
-AS_IF([test "x$gnurl" = x1],[
-       AM_CONDITIONAL(HAVE_LIBGNURL, true)
-       AC_DEFINE([HAVE_LIBGNURL],[1],[Have libgnurl])
-],[
-       AM_CONDITIONAL(HAVE_LIBGNURL, false)
-])
-
 # libcurl-gnutls
 LIBCURL_CHECK_CONFIG(,7.34.0,[curl=true],[curl=false])
 AS_IF([test "x$curl" = xtrue],
@@ -192,30 +182,16 @@ AS_IF([test "x$curl" = xtrue],
                     [curl=false])])
        # cURL must support CURLINFO_TLS_SESSION, version >= 7.34
 
-# Check for curl/curl.h and gnurl/curl.h so we can use #ifdef
-# HAVE_CURL_CURL_H later (the above LIBCURL_CHECK_CONFIG accepted
-# *either* header set).
+# Check for curl/curl.h
 AC_CHECK_HEADERS([curl/curl.h],,
-  curl=false
-  AC_CHECK_HEADERS([gnurl/curl.h],,
-  gnurl=false))
-
-# libgnurl
-AS_IF([test "x$gnurl" = "x0"],
-      [AS_IF([test "x$curl" = "x0"],
-              [AC_MSG_NOTICE([NOTICE: libgnurl not found. taler-bank support 
will not be compiled.])],
-              [AC_MSG_NOTICE([WARNING: libgnurl not found, trying to use 
libcurl-gnutls instead.])])])
+  curl=false)
 
 AS_IF([test x$curl = xfalse],
-       [AM_CONDITIONAL(HAVE_LIBCURL, false)
-        AS_IF([test "x$gnurl" = "x0"],
-              [AC_MSG_WARN([GNU Taler requires libcurl-gnutls  >= 7.34])])],
-       [AM_CONDITIONAL(HAVE_LIBCURL, true)
-       AC_DEFINE([HAVE_LIBCURL],[1],[Have CURL])])
+      [AC_MSG_ERROR([GNU Taler requires libcurl-gnutls  >= 7.34])])
 
 # check for libtalertwistertesting
 twistertesting=0
-AC_MSG_CHECKING([for talerwtistertesting])
+AC_MSG_CHECKING([for talertwistertesting])
 AC_ARG_WITH([twister],
             [AS_HELP_STRING([--with-twister=PFX], [base of 
libtalertwistertesting])],
             [AC_MSG_RESULT([given as $with_twister])],
@@ -306,8 +282,6 @@ AM_CONDITIONAL([ENABLE_DOC], [test "x$enable_doc" = "xyes"])
 # logic if doc_only is set, make sure conditionals are still defined
 AM_CONDITIONAL([HAVE_GNUNETPQ], [false])
 AM_CONDITIONAL([HAVE_POSTGRESQL], [false])
-AM_CONDITIONAL([HAVE_LIBCURL], [false])
-AM_CONDITIONAL([HAVE_LIBGNURL], [false])
 AM_CONDITIONAL([USE_COVERAGE], [false])
 AM_CONDITIONAL([ENABLE_DOC], [true])
 AM_CONDITIONAL([HAVE_TWISTER], [true])
diff --git a/src/testing/test_sync_api.c b/src/testing/test_sync_api.c
index a4105a9..08657bb 100644
--- a/src/testing/test_sync_api.c
+++ b/src/testing/test_sync_api.c
@@ -142,7 +142,7 @@ run (void *cls,
                                     "exchange-account-exchange"),
     TALER_TESTING_cmd_system_start ("start-taler",
                                     CONFIG_FILE,
-                                    "-emb",
+                                    "-embs",
                                     "-u", "exchange-account-exchange",
                                     NULL),
     TALER_TESTING_cmd_get_exchange ("get-exchange",
diff --git a/src/testing/test_sync_api.conf b/src/testing/test_sync_api.conf
index e65eaa2..717c07d 100644
--- a/src/testing/test_sync_api.conf
+++ b/src/testing/test_sync_api.conf
@@ -21,6 +21,14 @@ DURATION = 14 days
 [bank]
 HTTP_PORT = 8082
 
+[libeufin-bank]
+CURRENCY = EUR
+PORT = 8082
+
+[libeufin-bankdb-postgres]
+CONFIG = postgres:///synccheck
+SQL_DIR = $DATADIR/sql/
+
 [sync]
 PORT = 8084
 PAYMENT_BACKEND_URL = "http://localhost:8080/";
@@ -77,6 +85,10 @@ ENABLE_CREDIT = YES
 WIRE_GATEWAY_URL = "http://localhost:8082/accounts/2/taler-wire-gateway/";
 WIRE_GATEWAY_AUTH_METHOD = NONE
 
+[admin-accountcredentials-exchange]
+WIRE_GATEWAY_URL = "http://localhost:8082/accounts/2/taler-wire-gateway/";
+WIRE_GATEWAY_AUTH_METHOD = NONE
+
 [coin_eur_ct_1]
 value = EUR:0.01
 duration_withdraw = 7 days

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