From f82488c060ea980b1da69a022f26658526575547 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Thu, 31 Dec 2020 22:22:19 +0100 Subject: 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 91816ca8a..9a3d63bbb 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 e2f247cf9..4cf365f9c 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 5333cbda5..109ee29a4 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 d6973cc82..797dc873c 100644 --- a/src/mhd/Makefile.am +++ b/src/mhd/Makefile.am @@ -24,4 +24,5 @@ libtalermhd_la_LIBADD = \ -lgnunetutil \ -lmicrohttpd \ -ljansson \ + -lz \ $(XLIB) -- cgit v1.2.3