From 2bc2abc68af3b091257d38662db3c65f7dab6273 Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Mon, 16 May 2011 10:00:37 +0000 Subject: build-sys: Link libpulse directly to libdbus-1 if needed Linking libpulse with gold or when using ld --no-add-needed fails as libpulse uses dbus methods directly but isn't explicitly linked to it. So link to it when needed :) --- src/Makefile.am | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index 7a4a32d6..d4f595c7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -806,10 +806,15 @@ libpulse_la_SOURCES = \ pulse/volume.c pulse/volume.h \ pulse/xmalloc.c pulse/xmalloc.h -libpulse_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) +libpulse_la_CFLAGS = $(AM_CFLAGS) libpulse_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) $(LTLIBICONV) libpulsecommon-@PA_MAJORMINOR@.la libpulse_la_LDFLAGS = $(AM_LDFLAGS) $(VERSIONING_LDFLAGS) -version-info $(LIBPULSE_VERSION_INFO) +if HAVE_DBUS +libpulse_la_CFLAGS += $(DBUS_CFLAGS) +libpulse_la_LIBADD += $(DBUS_LIBS) +endif + libpulse_simple_la_SOURCES = pulse/simple.c pulse/simple.h libpulse_simple_la_CFLAGS = $(AM_CFLAGS) libpulse_simple_la_LIBADD = $(AM_LIBADD) libpulse.la libpulsecommon-@PA_MAJORMINOR@.la -- cgit