8 files changed, 19 insertions, 72 deletions
diff --git a/configure.ac b/configure.ac
index 837c33cc..99801c6c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,6 +85,14 @@ AX_LIB_POSTGRESQL([9.3])
 AS_IF([test "x$found_postgresql" = "xyes"],[postgres=true])
 AM_CONDITIONAL(HAVE_POSTGRESQL, test x$postgres = xtrue)
 
+
+TALER_LIB_LDFLAGS="-export-dynamic -no-undefined"
+TALER_PLUGIN_LDFLAGS="-export-dynamic -avoid-version -module -no-undefined"
+
+AC_SUBST(TALER_LIB_LDFLAGS)
+AC_SUBST(TALER_PLUGIN_LDFLAGS)
+
+
 # Check for Taler's libtalerpq
 libtalerpq=0
 AC_MSG_CHECKING([for libtalerpq])
diff --git a/debian/libtalermerchant.substvars b/debian/libtalermerchant.substvars
index 4d876ce7..2aeedff3 100644
--- a/debian/libtalermerchant.substvars
+++ b/debian/libtalermerchant.substvars
@@ -1,3 +1,3 @@
-shlibs:Depends=libc6 (>= 2.29), libcurl3-gnutls (>= 7.35.0), libgcrypt20 (>= 1.8.0), libgnunet (>= 0.14.0), libjansson4 (>= 2.3), libmicrohttpd12 (>= 0.9.50), libpq5, libsqlite3-0 (>= 3.5.9), libtalerexchange (>= 0.9.0), zlib1g (>= 1:1.2.0)
+shlibs:Depends=libc6 (>= 2.14), libcurl3-gnutls (>= 7.16.2), libgnunet (>= 0.14.0), libjansson4 (>= 2.0.1), libltdl7 (>= 2.4.6), libtalerexchange (>= 0.9.0), libtalermerchant (>= 0.9.0)
 misc:Depends=
 misc:Pre-Depends=
diff --git a/debian/rules b/debian/rules
index 5c32fe88..d7979eaa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,8 @@ override_dh_auto_install-arch:
 	# Removing useless files
 	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la \
 		debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/taler/*.la \
-		debian/tmp/usr/share/doc/taler/COPYING
+		debian/tmp/usr/share/doc/taler/COPYING \
+        debian/tmp/usr/lib/x86_64-linux-gnu/libmustach.a
 
 override_dh_auto_install-indep:
 
@@ -33,4 +34,4 @@ override_dh_auto_clean:
 # Remove files already present in libtalerexchange from main taler-exchange package
 override_dh_install:
 	dh_install
-	cd debian/libtalerexchange; find . -type f -exec rm -f ../taler-exchange/{} \;
+	cd debian/libtalermerchant; find . -type f -exec rm -f ../taler-merchant/{} \;
diff --git a/debian/taler-merchant.postrm b/debian/taler-merchant.postrm
index 2cf6a941..3cf433e1 100644
--- a/debian/taler-merchant.postrm
+++ b/debian/taler-merchant.postrm
@@ -41,6 +41,7 @@ fi
 
 if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then
 	if [ -f /usr/share/debconf/confmodule ]; then
+		. /usr/share/debconf/confmodule
 		db_version 2.0
 		db_get taler-merchant/reconfigure-webserver
 		webservers="$RET"
diff --git a/debian/taler-merchant.substvars b/debian/taler-merchant.substvars
index ff879441..3bbad5ad 100644
--- a/debian/taler-merchant.substvars
+++ b/debian/taler-merchant.substvars
@@ -1,3 +1,3 @@
 misc:Depends=debconf (>= 0.5) | debconf-2.0
-shlibs:Depends=libc6 (>= 2.14), libgnunet (>= 0.14.0), libjansson4 (>= 2.0.1), libmicrohttpd12 (>= 0.9.50), libtalerexchange (>= 0.9.0)
+shlibs:Depends=libc6 (>= 2.14), libgnunet (>= 0.14.0), libjansson4 (>= 2.0.1), libmicrohttpd12 (>= 0.9.50), libqrencode4 (>= 3.2.0), libtalerexchange (>= 0.9.0), libtalermerchant (>= 0.9.0)
 misc:Pre-Depends=
diff --git a/src/backenddb/Makefile.am b/src/backenddb/Makefile.am
index d7eca447..f808e150 100644
--- a/src/backenddb/Makefile.am
+++ b/src/backenddb/Makefile.am
@@ -37,7 +37,8 @@ libtalermerchantdb_la_LIBADD = \
   $(LIBGCRYPT_LIBS) \
   -ltalerutil \
   -ltalerpq \
-  -lgnunetutil
+  -lgnunetutil \
+  -lltdl
 
 libtalermerchantdb_la_LDFLAGS = \
   $(POSTGRESQL_LDFLAGS) \
@@ -50,11 +51,12 @@ libtaler_plugin_merchantdb_postgres_la_LIBADD = \
   $(LTLIBINTL)
 libtaler_plugin_merchantdb_postgres_la_LDFLAGS = \
   $(TALER_PLUGIN_LDFLAGS) \
-  -lgnunetpq \
   -ltalerpq \
   -ltalerutil \
   -ltalerjson \
   -ltalermhd \
+  -lgnunetpq \
+  -lgnunetjson \
   -lpq \
   -lgnunetutil $(XLIB)
 
diff --git a/src/mustach/Makefile.orig b/src/mustach/Makefile.orig
deleted file mode 100644
index 3e0fd17d..00000000
--- a/src/mustach/Makefile.orig
+++ /dev/null
@@ -1,66 +0,0 @@
-DESTDIR ?=
-PREFIX  ?= /usr/local
-BINDIR  ?= $(PREFIX)/bin
-LIBDIR  ?= $(PREFIX)/lib
-INCLUDEDIR ?= $(PREFIX)/include
-SOVER = .0
-SOVEREV = .0.99
-
-CFLAGS += -fPIC -Wall -Wextra
-LDLIBS += -ljson-c
-
-lib_OBJ  = mustach.o mustach-json-c.o
-tool_OBJ = mustach.o mustach-json-c.o mustach-tool.o
-HEADERS  = mustach.h mustach-json-c.h
-
-lib_LDFLAGS  += -shared
-ifeq ($(shell uname),Darwin)
- lib_LDFLAGS += -install_name $(LIBDIR)/libmustach.so$(SOVEREV)
-endif
-
-all: mustach libmustach.so$(SOVEREV)
-
-install: all
-	install -d $(DESTDIR)$(BINDIR)
-	install -d $(DESTDIR)$(LIBDIR)
-	install -d $(DESTDIR)$(INCLUDEDIR)/mustach
-	install -m0755 mustach       $(DESTDIR)$(BINDIR)/
-	install -m0644 $(HEADERS)    $(DESTDIR)$(INCLUDEDIR)/mustach
-	install -m0755 libmustach.so* $(DESTDIR)$(LIBDIR)/
-	ln -sf libmustach.so$(SOVEREV) $(DESTDIR)$(LIBDIR)/libmustach.so$(SOVER)
-	ln -sf libmustach.so$(SOVEREV) $(DESTDIR)$(LIBDIR)/libmustach.so
-
-
-uninstall:
-	rm -f $(DESTDIR)$(BINDIR)/mustach
-	rm -f $(DESTDIR)$(LIBDIR)/libmustach.so*
-	rm -rf $(DESTDIR)$(INCLUDEDIR)/mustach
-
-mustach: $(tool_OBJ)
-	$(CC) $(LDFLAGS) -o mustach $(tool_OBJ) $(LDLIBS)
-
-libmustach.so$(SOVEREV): $(lib_OBJ)
-	$(CC) $(LDFLAGS) $(lib_LDFLAGS) -o libmustach.so$(SOVEREV) $(lib_OBJ) $(LDLIBS)
-
-mustach.o:      mustach.h
-mustach-json.o: mustach.h mustach-json-c.h
-mustach-tool.o: mustach.h mustach-json-c.h
-
-test: mustach
-	@$(MAKE) -C test1 test
-	@$(MAKE) -C test2 test
-	@$(MAKE) -C test3 test
-	@$(MAKE) -C test4 test
-	@$(MAKE) -C test5 test
-	@$(MAKE) -C test6 test
-
-clean:
-	rm -f mustach libmustach.so$(SOVEREV) *.o
-	@$(MAKE) -C test1 clean
-	@$(MAKE) -C test2 clean
-	@$(MAKE) -C test3 clean
-	@$(MAKE) -C test4 clean
-	@$(MAKE) -C test5 clean
-	@$(MAKE) -C test6 clean
-
-.PHONY: test clean install uninstall
diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index 6fabd904..aef75ed0 100644
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -60,6 +60,7 @@ libtalermerchanttesting_la_SOURCES = \
 
 libtalermerchanttesting_la_LIBADD = \
   $(top_srcdir)/src/lib/libtalermerchant.la \
+  -ltalerbank \
   -ltalerexchange \
   -ltalerjson \
   -ltalerutil \