aboutsummaryrefslogtreecommitdiffstats
path: root/erts/epmd/src
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2014-04-24 15:20:08 +0200
committerLukas Larsson <[email protected]>2014-05-09 18:03:56 +0200
commit12cd5e5b394623fab9907622ad99163c5b9350e1 (patch)
treefd7823917302ed9e3d0b9bdb7948e53a77aad0d1 /erts/epmd/src
parent07b8f441ca711f9812fad9e9115bab3c3aa92f79 (diff)
downloadotp-12cd5e5b394623fab9907622ad99163c5b9350e1.tar.gz
otp-12cd5e5b394623fab9907622ad99163c5b9350e1.tar.bz2
otp-12cd5e5b394623fab9907622ad99163c5b9350e1.zip
erts: Fix various autoconf issues
* Check of atomics on bsd * Add --enable-systemd for epmd * Remove unused --enable-tsp option
Diffstat (limited to 'erts/epmd/src')
-rw-r--r--erts/epmd/src/Makefile.in2
-rw-r--r--erts/epmd/src/epmd_srv.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/erts/epmd/src/Makefile.in b/erts/epmd/src/Makefile.in
index 8dc8dae5f6..0c7787a3b1 100644
--- a/erts/epmd/src/Makefile.in
+++ b/erts/epmd/src/Makefile.in
@@ -84,7 +84,7 @@ LD = @LD@
ifeq ($(findstring ose,$(TARGET)),ose)
LIBS = $(ERTS_INTERNAL_LIBS) @LIBS@
else
-LIBS = @LIBS@ $(ERTS_INTERNAL_LIBS)
+LIBS = @LIBS@ @SYSTEMD_DAEMON_LIBS@ $(ERTS_INTERNAL_LIBS)
endif
LDFLAGS = @LDFLAGS@
diff --git a/erts/epmd/src/epmd_srv.c b/erts/epmd/src/epmd_srv.c
index 93982c2f60..48fd7a5f9c 100644
--- a/erts/epmd/src/epmd_srv.c
+++ b/erts/epmd/src/epmd_srv.c
@@ -213,7 +213,7 @@ void run(EpmdVars *g)
node_init(g);
g->conn = conn_init(g);
-#ifdef HAVE_SYSTEMD_SD_DAEMON_H
+#ifdef HAVE_SYSTEMD_DAEMON
if (g->is_systemd)
{
int n;
@@ -310,7 +310,7 @@ void run(EpmdVars *g)
SET_ADDR(iserv_addr[0],EPMD_ADDR_ANY,sport);
num_sockets = 1;
}
-#ifdef HAVE_SYSTEMD_SD_DAEMON_H
+#ifdef HAVE_SYSTEMD_DAEMON
}
#endif