From f36dd15e1b1397eae33d0f426b5d2415073e6361 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 16 Oct 2014 17:18:38 +0100 Subject: [PATCH 6/8] tests: link shared test executables explicitly to our libdbus-1.la Otherwise they'll be linked to the system libdbus-1.so (via dbus-glib), and that might be older than ours and contain less ABI. --- test/Makefile.am | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/test/Makefile.am b/test/Makefile.am index 1ceb5b6..65c2496 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -40,10 +40,15 @@ libdbus_testutils_la_LIBADD = \ $(DBUS_GLIB_LIBS) \ $(NULL) testutils_shared_if_possible_cppflags = $(AM_CPPFLAGS) -testutils_shared_if_possible_libs = libdbus-testutils.la +testutils_shared_if_possible_libs = \ + $(top_builddir)/dbus/libdbus-1.la \ + libdbus-testutils.la \ + $(NULL) else testutils_shared_if_possible_cppflags = $(static_cppflags) -testutils_shared_if_possible_libs = libdbus-testutils-internal.la +testutils_shared_if_possible_libs = \ + libdbus-testutils-internal.la \ + $(NULL) endif libdbus_testutils_internal_la_CPPFLAGS = \ -- 2.1.1