[taler-exchange] branch master updated: add missing linker options, bonus fun

[gnunet]

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

grothoff pushed a commit to branch master
in repository exchange.

The following commit(s) were added to refs/heads/master by this push:
     new f82488c0 add missing linker options, bonus fun
f82488c0 is described below

commit f82488c060ea980b1da69a022f26658526575547
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Thu Dec 31 22:22:19 2020 +0100

    add missing linker options, bonus fun
---
 configure.ac               | 6 +++---
 contrib/gana               | 2 +-
 src/exchangedb/Makefile.am | 2 +-
 src/mhd/Makefile.am        | 1 +
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 91816ca8..9a3d63bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -211,9 +211,9 @@ AS_IF([test "$gnurl" = 1],
              [AM_CONDITIONAL(HAVE_LIBGNURL, false)
               AC_DEFINE([HAVE_LIBGNURL],[0],[Lacking libgnurl])
               AM_CONDITIONAL(HAVE_LIBCURL, true)
-              AC_DEFINE([HAVE_LIBCURL],[1],[Have libcurl])],
-              [LIBGNURLCURL_LIBS="-lcurl"]
-             [AC_MSG_ERROR([WARNING: No libgnurl/libcurl, taler-bank support 
will not be compiled])])])
+              AC_DEFINE([HAVE_LIBCURL],[1],[Have libcurl])
+              [LIBGNURLCURL_LIBS="-lcurl"]],
+             [AC_MSG_ERROR([FATAL: No libgnurl/libcurl])])])
 
 AC_SUBST([LIBGNURLCURL_LIBS])
 
diff --git a/contrib/gana b/contrib/gana
index e2f247cf..4cf365f9 160000
--- a/contrib/gana
+++ b/contrib/gana
@@ -1 +1 @@
-Subproject commit e2f247cf9364ea0d441ae4c7b2f0aaa427e03dae
+Subproject commit 4cf365f9c9b07fefa00fed6092885309359b6093
diff --git a/src/exchangedb/Makefile.am b/src/exchangedb/Makefile.am
index 5333cbda..109ee29a 100644
--- a/src/exchangedb/Makefile.am
+++ b/src/exchangedb/Makefile.am
@@ -44,6 +44,7 @@ libtaler_plugin_exchangedb_postgres_la_LDFLAGS = \
   $(top_builddir)/src/pq/libtalerpq.la \
   $(top_builddir)/src/util/libtalerutil.la \
   -lpq \
+  -lpthread \
   -lgnunetpq \
   -lgnunetutil \
   $(XLIB)
@@ -59,7 +60,6 @@ libtalerexchangedb_la_LIBADD = \
   $(top_builddir)/src/bank-lib/libtalerbank.la \
   $(top_builddir)/src/util/libtalerutil.la \
   -lgnunetutil \
-  -lpthread \
   $(XLIB)
 libtalerexchangedb_la_LDFLAGS = \
   $(POSTGRESQL_LDFLAGS) \
diff --git a/src/mhd/Makefile.am b/src/mhd/Makefile.am
index d6973cc8..797dc873 100644
--- a/src/mhd/Makefile.am
+++ b/src/mhd/Makefile.am
@@ -24,4 +24,5 @@ libtalermhd_la_LIBADD = \
   -lgnunetutil \
   -lmicrohttpd \
   -ljansson \
+  -lz \
   $(XLIB)

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