More build script fixes

Makefile.am

@@ -6,7 +6,7 @@ AM_CPPFLAGS = -I${top_srcdir}/src
 
 # Build rules for riemannpp library
 pkginclude_HEADERS = \
-  src/riemannpp/riemannpp.hpp
+	src/riemannpp/riemannpp.hpp
 
 lib_LTLIBRARIES = \
 	src/riemannpp/libriemannpp.la
@@ -53,8 +53,8 @@ test_riemannpp_test_SOURCES = \
 	test/message_test.cpp
 test_riemannpp_test_CPPFLAGS = -I$(top_srcdir)/src $(RIEMANN_CLIENT_CPPFLAGS)
 test_riemannpp_test_CXXFLAGS = $(RIEMANN_CLIENT_CXXFLAGS)
-test_riemannpp_test_LDFLAGS = $(RIEMANN_CLIENT_LDFLAGS)
-test_riemannpp_test_LDADD = $(top_builddir)/src/riemannpp/libriemannpp.la
+test_riemannpp_test_LDFLAGS = $(RIEMANN_LDFLAGS)
+test_riemannpp_test_LDADD = $(top_builddir)/src/riemannpp/libriemannpp.la $(RIEMANN_CLIENT_LIBS)
 
 TESTS += $(UNIT_TESTS)
 

configure.ac

@@ -23,6 +23,13 @@ m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 # Initialise libtool
 LT_INIT
 
+# Debian resets this to no, but this break both Spot and the libtool
+# test suite itself.  Instead of requiring developer to install a
+# non-patched version of Libtool on any Debian they use, we just
+# cancel the effect of Debian's patch here.
+link_all_deplibs=yes
+link_all_deplibs_CXX=yes
+
 # Check for a C compiler
 AC_PROG_CC