From: Simon McVittie <smcv@collabora.com>
Date: Thu, 28 Sep 2017 12:19:43 +0000 (+0100)
Subject: dbus: Actually link versioninfo.o into libdbus
X-Git-Tag: dbus-1.11.20~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=74b4cc914f33ec9647e960aada686c0680b7e59d;p=thirdparty%2Fdbus.git

dbus: Actually link versioninfo.o into libdbus

It appears this has been wrong ever since the versioninfo machinery
was first added in 2009, and nobody noticed until now.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103015
Signed-off-by: Simon McVittie <smcv@collabora.com>
Reviewed-by: Philip Withnall <withnall@endlessm.com>
---

diff --git a/dbus/Makefile.am b/dbus/Makefile.am
index 064d4152d..5ee57ac20 100644
--- a/dbus/Makefile.am
+++ b/dbus/Makefile.am
@@ -310,6 +310,7 @@ libdbus_1_la_LDFLAGS = \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
 	$(SYMBOL_EXPORT_LDFLAGS) \
 	-no-undefined \
+	$(dbus_res_ldflag) \
 	$(NULL)
 
 libdbus_internal_la_LIBADD=$(LIBDBUS_LIBS) libdbus-1.la