diff options
| author | Lukas Larsson <[email protected]> | 2014-05-09 18:04:37 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2014-05-09 18:04:37 +0200 |
| commit | b2a3369ddb5178705f1634d9fe355696907106dc (patch) | |
| tree | 6065b431b28f5689ee551d22a5cb9e12fc915d72 /erts/epmd | |
| parent | fbf8c0930eefe63b42c3334670b6da7c538a951f (diff) | |
| parent | 3b85eee9540b49936d203978369c2a5d7bdd24c4 (diff) | |
| download | otp-b2a3369ddb5178705f1634d9fe355696907106dc.tar.gz otp-b2a3369ddb5178705f1634d9fe355696907106dc.tar.bz2 otp-b2a3369ddb5178705f1634d9fe355696907106dc.zip | |
Merge branch 'maint'
* maint:
erts: Fix various autoconf issues
Diffstat (limited to 'erts/epmd')
| -rw-r--r-- | erts/epmd/src/Makefile.in | 2 | ||||
| -rw-r--r-- | erts/epmd/src/epmd_srv.c | 4 |
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 |