Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CFE-4274: Have protocol_test depend explicitly on libsystemd #5075

Closed
wants to merge 1 commit into from
Closed

CFE-4274: Have protocol_test depend explicitly on libsystemd #5075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions cf-serverd/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ AM_CFLAGS = \
$(PTHREAD_CFLAGS) \
$(ENTERPRISE_CFLAGS)

LIBS += $(SYSTEMD_SOCKET_LIBS)

libcf_serverd_la_LIBADD = ../libpromises/libpromises.la

libcf_serverd_la_SOURCES = \
Expand Down
3 changes: 3 additions & 0 deletions tests/unit/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ LDADD = ../../libpromises/libpromises.la libtest.la
# implementation, then we are pretty sure that they will be overriden by
# our local implementation. So we include *everything*...
LIBS = $(CORE_LIBS)
# protocol_test relies on cf-serverd-functions which can rely on libsystemd so need SYSTEMD_SOCKET_LIBS here
LIBS += $(SYSTEMD_SOCKET_LIBS)
AM_LDFLAGS = $(CORE_LDFLAGS)

AM_CFLAGS = $(PTHREAD_CFLAGS)
Expand Down Expand Up @@ -240,6 +242,7 @@ protocol_test_SOURCES = protocol_test.c \
../../cf-serverd/server_access.c \
../../cf-serverd/strlist.c
protocol_test_LDADD = ../../libpromises/libpromises.la libtest.la
protocol_test_LDFLAGS = -lsystemd

if HAVE_AVAHI_CLIENT
if HAVE_AVAHI_COMMON
Expand Down
Loading