From: Colin Walters <walters@verbum.org>
Date: Sun, 23 Dec 2012 15:18:21 +0000 (-0500)
Subject: build-sys: Make libsystemd-shared link to libsystemd-daemon
X-Git-Tag: v197~100
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=81dc4bde12acd0a59ad96a505dbb109a9e4f320e

build-sys: Make libsystemd-shared link to libsystemd-daemon

Commit f934051c4d17d167bd8e46dd3c70a745e26fd2eb broke the build
because it made libsystemd-shared call sd_listen_fds() which is
defined in libsystemd-daemon.

This is a bit of a contortion because libsystemd-shared.la is a
noinst_LTLIBRARY, but libtool should do the right thing here and emit
DT_NEEDED on libsystemd-daemon.so for things that consume
libsystemd-shared.la.
---

diff --git a/Makefile.am b/Makefile.am
index 165b85dea..163a180dc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -849,6 +849,8 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/calendarspec.c \
 	src/shared/calendarspec.h
 
+libsystemd_shared_la_LIBADD = libsystemd-daemon.la
+
 #-------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
 	libsystemd-dbus.la