Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 508366 | Differences between
and this patch

Collapse All | Expand All

(-)a/erts/configure.in (-3 / +23 lines)
Lines 366-371 AC_DEFINE_UNQUOTED(ASSUMED_CACHE_LINE_SIZE, Link Here
366
		   $with_assumed_cache_line_size,
363
		   $with_assumed_cache_line_size,
367
		   [Assumed cache-line size (in bytes)])
364
		   [Assumed cache-line size (in bytes)])
368
365
366
AC_ARG_ENABLE(systemd,
367
AS_HELP_STRING([--enable-systemd], [enable systemd support in epmd]),
368
[],
369
[enable_systemd=no])
370
369
dnl Magic test for clearcase.
371
dnl Magic test for clearcase.
370
OTP_RELEASE=
372
OTP_RELEASE=
371
if test "${ERLANG_COMMERCIAL_BUILD}" != ""; then
373
if test "${ERLANG_COMMERCIAL_BUILD}" != ""; then
Lines 1042-1049 AC_CHECK_LIB(dl, dlopen) Link Here
1042
AC_CHECK_LIB(inet, main)
1044
AC_CHECK_LIB(inet, main)
1043
AC_CHECK_LIB(util, openpty)
1045
AC_CHECK_LIB(util, openpty)
1044
1046
1045
AC_CHECK_LIB(systemd-daemon, sd_listen_fds)
1046
1047
dnl Try to find a thread library.
1047
dnl Try to find a thread library.
1048
dnl
1048
dnl
1049
dnl ETHR_LIB_NAME, ETHR_LIBS, ETHR_X_LIBS, ETHR_THR_LIB_BASE and ETHR_DEFS
1049
dnl ETHR_LIB_NAME, ETHR_LIBS, ETHR_X_LIBS, ETHR_THR_LIB_BASE and ETHR_DEFS
Lines 1679-1685 AC_CHECK_MEMBERS([struct ifreq.ifr_enaddr], [], [], Link Here
1679
	 #endif
1679
	 #endif
1680
	])
1680
	])
1681
1681
1682
AC_CHECK_HEADERS(systemd/sd-daemon.h)
1682
dnl ----------------------------------------------------------------------
1683
dnl  Check the availability of systemd
1684
dnl ----------------------------------------------------------------------
1685
if test x"$enable_systemd" != x"no"; then
1686
1687
AC_SEARCH_LIBS(sd_listen_fds,[systemd-daemon],
1688
  [have_sd_listen_fds=yes],[have_sd_listen_fds=no])
1689
AC_CHECK_HEADERS(systemd/sd-daemon.h,
1690
  [have_systemd_sd_daemon_h=yes],[have_systemd_sd_daemon_h=no])
1691
1692
if test x"$have_sd_listen_fds" = x"yes" && \
1693
   test x"$have_systemd_sd_daemon_h" = x"yes"; then
1694
  AC_DEFINE([HAVE_SYSTEMD_DAEMON],[1],[Define if you have systemd daemon])
1695
elif test x"$enable_systemd" = x"yes"; then
1696
  AC_MSG_FAILURE([--enable-systemd was given, but test for systemd failed])
1697
fi
1698
fi
1699
1683
1700
1684
dnl ----------------------------------------------------------------------
1701
dnl ----------------------------------------------------------------------
1685
dnl Check the availability for libdlpi
1702
dnl Check the availability for libdlpi
(-)a/erts/epmd/src/epmd_srv.c (-2 / +2 lines)
Lines 213-219 void run(EpmdVars *g) Link Here
213
  node_init(g);
213
  node_init(g);
214
  g->conn = conn_init(g);
214
  g->conn = conn_init(g);
215
215
216
#ifdef HAVE_SYSTEMD_SD_DAEMON_H
216
#ifdef HAVE_SYSTEMD_DAEMON
217
  if (g->is_systemd)
217
  if (g->is_systemd)
218
    {
218
    {
219
      int n;
219
      int n;
Lines 310-316 void run(EpmdVars *g) Link Here
310
      SET_ADDR(iserv_addr[0],EPMD_ADDR_ANY,sport);
310
      SET_ADDR(iserv_addr[0],EPMD_ADDR_ANY,sport);
311
      num_sockets = 1;
311
      num_sockets = 1;
312
    }
312
    }
313
#ifdef HAVE_SYSTEMD_SD_DAEMON_H
313
#ifdef HAVE_SYSTEMD_DAEMON
314
    }
314
    }
315
#endif
315
#endif
316
316

Return to bug 508366