GitLab/ocserv
1
0
Fork 0
mirror of https://gitlab.com/openconnect/ocserv.git synced 2026-02-10 16:57:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Replace LIBSYSTEMD_DAEMON with LIBSYSTEMD

Browse Source 
Signed-off-by: Aron Xu <aron@debian.org>
This commit is contained in:
Aron Xu
2015-01-24 16:25:38 +08:00
committed by Nikos Mavrogiannopoulos
parent dfc5f33f85
commit d4b6d97697
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@@ -319,7 +319,7 @@ AC_ARG_ENABLE(systemd,
if [ test "$systemd_enabled" = "yes" ];then if [ test "$systemd_enabled" = "yes" ];then
AC_LIB_HAVE_LINKFLAGS(systemd,, [#include <systemd/sd-daemon.h>], [sd_listen_fds(0);]) AC_LIB_HAVE_LINKFLAGS(systemd,, [#include <systemd/sd-daemon.h>], [sd_listen_fds(0);])
if [ test -z "$LIBSYSTEMD_DAEMON" ];then if [ test -z "$LIBSYSTEMD" ];then
systemd_enabled="no" systemd_enabled="no"
else else
systemd_enabled="yes" systemd_enabled="yes"

2
src/Makefile.am
View File

@@ -89,7 +89,7 @@ ocserv_SOURCES += ipc.pb-c.h ipc.pb-c.c ctl.pb-c.c ctl.pb-c.h
ocserv_LDADD = ../gl/libgnu.a $(NEEDED_LIBOPTS) libcmd-ocserv.a ocserv_LDADD = ../gl/libgnu.a $(NEEDED_LIBOPTS) libcmd-ocserv.a
ocserv_LDADD += $(LIBGNUTLS_LIBS) $(PAM_LIBS) $(LIBUTIL) \ ocserv_LDADD += $(LIBGNUTLS_LIBS) $(PAM_LIBS) $(LIBUTIL) \
$(LIBSECCOMP) $(LIBWRAP) $(LIBCRYPT) $(NEEDED_HTTP_PARSER_LIBS) \ $(LIBSECCOMP) $(LIBWRAP) $(LIBCRYPT) $(NEEDED_HTTP_PARSER_LIBS) \
$(LIBPROTOBUF_C_LIBS) $(LIBSYSTEMD_DAEMON) $(LIBTALLOC_LIBS) \ $(LIBPROTOBUF_C_LIBS) $(LIBSYSTEMD) $(LIBTALLOC_LIBS) \
$(FREERADIUS_CLIENT_LIBS) $(LIBLZ4_LIBS) $(FREERADIUS_CLIENT_LIBS) $(LIBLZ4_LIBS)

4
src/main.c
View File

@@ -47,7 +47,7 @@
# include <tcpd.h> # include <tcpd.h>
#endif #endif
#ifdef HAVE_LIBSYSTEMD_DAEMON #ifdef HAVE_LIBSYSTEMD
# include <systemd/sd-daemon.h> # include <systemd/sd-daemon.h>
#endif #endif
#include <main.h> #include <main.h>
@@ -278,7 +278,7 @@ listen_ports(void *pool, struct cfg_st* config,
list_head_init(&list->head); list_head_init(&list->head);
list->total = 0; list->total = 0;
#ifdef HAVE_LIBSYSTEMD_DAEMON #ifdef HAVE_LIBSYSTEMD
/* Support for systemd socket-activatable service */ /* Support for systemd socket-activatable service */
if ((fds=sd_listen_fds(0)) > 0) { if ((fds=sd_listen_fds(0)) > 0) {
/* if we get our fds from systemd */ /* if we get our fds from systemd */