Attachment #376464 for bug #508366




dnl ----------------------------------------------------------------------
if test x"$enable_systemd" != x"no"; then

systemd_daemon_save_LIBS=$LIBS
LIBS=
AC_SEARCH_LIBS(sd_listen_fds,[systemd systemd-daemon],
  [have_sd_listen_fds=yes],[have_sd_listen_fds=no],$systemd_daemon_save_LIBS)
AC_CHECK_HEADERS(systemd/sd-daemon.h,
  [have_systemd_sd_daemon_h=yes],[have_systemd_sd_daemon_h=no])

if test x"$have_sd_listen_fds" = x"yes" && \
   test x"$have_systemd_sd_daemon_h" = x"yes"; then
  AC_DEFINE([HAVE_SYSTEMD_DAEMON],[1],[Define if you have systemd daemon])
  SYSTEMD_DAEMON_LIBS=$LIBS
elif test x"$enable_systemd" = x"yes"; then
  AC_MSG_FAILURE([--enable-systemd was given, but test for systemd failed])
fi
LIBS=$systemd_daemon_save_LIBS
fi
AC_SUBST(SYSTEMD_DAEMON_LIBS)


dnl ----------------------------------------------------------------------

Lines 84-90 LD = @LD@ Link Here

(-)a/erts/epmd/src/Makefile.in (-2 / +1 lines)
84	ifeq ($(findstring ose,$(TARGET)),ose)	84	ifeq ($(findstring ose,$(TARGET)),ose)
85	LIBS = $(ERTS_INTERNAL_LIBS) @LIBS@	85	LIBS = $(ERTS_INTERNAL_LIBS) @LIBS@
86	else	86	else
87	LIBS = @LIBS@ $(ERTS_INTERNAL_LIBS)	87	LIBS = @LIBS@ @SYSTEMD_DAEMON_LIBS@ $(ERTS_INTERNAL_LIBS)
88	endif	88	endif
89	LDFLAGS = @LDFLAGS@	89	LDFLAGS = @LDFLAGS@
90		90
91	-

Return to bug 508366

Lines 1684-1701 dnl Check the availability of systemd Link Here

(-)a/erts/configure.in (-2 / +7 lines)
1684	dnl ----------------------------------------------------------------------	1684	dnl ----------------------------------------------------------------------
1685	if test x"$enable_systemd" != x"no"; then	1685	if test x"$enable_systemd" != x"no"; then
1686		1686
1687	AC_SEARCH_LIBS(sd_listen_fds,[systemd-daemon],	1687	systemd_daemon_save_LIBS=$LIBS
1688	[have_sd_listen_fds=yes],[have_sd_listen_fds=no])	1688	LIBS=
		1689	AC_SEARCH_LIBS(sd_listen_fds,[systemd systemd-daemon],
		1690	[have_sd_listen_fds=yes],[have_sd_listen_fds=no],$systemd_daemon_save_LIBS)
1689	AC_CHECK_HEADERS(systemd/sd-daemon.h,	1691	AC_CHECK_HEADERS(systemd/sd-daemon.h,
1690	[have_systemd_sd_daemon_h=yes],[have_systemd_sd_daemon_h=no])	1692	[have_systemd_sd_daemon_h=yes],[have_systemd_sd_daemon_h=no])
1691		1693
1692	if test x"$have_sd_listen_fds" = x"yes" && \	1694	if test x"$have_sd_listen_fds" = x"yes" && \
1693	test x"$have_systemd_sd_daemon_h" = x"yes"; then	1695	test x"$have_systemd_sd_daemon_h" = x"yes"; then
1694	AC_DEFINE([HAVE_SYSTEMD_DAEMON],[1],[Define if you have systemd daemon])	1696	AC_DEFINE([HAVE_SYSTEMD_DAEMON],[1],[Define if you have systemd daemon])
		1697	SYSTEMD_DAEMON_LIBS=$LIBS
1695	elif test x"$enable_systemd" = x"yes"; then	1698	elif test x"$enable_systemd" = x"yes"; then
1696	AC_MSG_FAILURE([--enable-systemd was given, but test for systemd failed])	1699	AC_MSG_FAILURE([--enable-systemd was given, but test for systemd failed])
1697	fi	1700	fi
		1701	LIBS=$systemd_daemon_save_LIBS
1698	fi	1702	fi
		1703	AC_SUBST(SYSTEMD_DAEMON_LIBS)
1699		1704
1700		1705
1701	dnl ----------------------------------------------------------------------	1706	dnl ----------------------------------------------------------------------