summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2020-12-31 22:22:19 +0100
committerChristian Grothoff <christian@grothoff.org>2020-12-31 22:22:19 +0100
commitf82488c060ea980b1da69a022f26658526575547 (patch)
tree0e6c172171075dc4e2c871aa5454ec37d3314b84
parent0bffea1f67067f56638a36d0b7db30af09d929ac (diff)
downloadexchange-f82488c060ea980b1da69a022f26658526575547.tar.gz
exchange-f82488c060ea980b1da69a022f26658526575547.tar.bz2
exchange-f82488c060ea980b1da69a022f26658526575547.zip
add missing linker options, bonus fun
-rw-r--r--configure.ac6
m---------contrib/gana0
-rw-r--r--src/exchangedb/Makefile.am2
-rw-r--r--src/mhd/Makefile.am1
4 files changed, 5 insertions, 4 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
-Subproject e2f247cf9364ea0d441ae4c7b2f0aaa427e03da
+Subproject 4cf365f9c9b07fefa00fed6092885309359b609
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)