Skip to content

Commit b700431

Browse files
Alphixsimo5
authored andcommitted
[gssproxy] Modernize systemd.m4 macro
libsystemd-daemon hasn't been a thing since systemd 209 was released (February 2014, before RHEL 7). And the thing we really want to look for is libsystemd, that's it. Signed-off-by: David Härdeman <david@hardeman.nu>
1 parent d4004e6 commit b700431

File tree

1 file changed

+11
-26
lines changed

1 file changed

+11
-26
lines changed

external/systemd.m4

Lines changed: 11 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,14 @@
1-
dnl A macro to check presence of systemd on the system
1+
dnl A macro to check presence of libsystemd on the system
22
AC_DEFUN([AM_CHECK_SYSTEMD],
33
[
4-
PKG_CHECK_EXISTS([systemd],
5-
[HAVE_SYSTEMD=yes],
6-
[HAVE_SYSTEMD=no])
7-
8-
dnl older system uses libsystemd
9-
PKG_CHECK_EXISTS([libsystemd],
10-
[HAVE_LIBSYSTEMD=yes],
11-
[HAVE_LIBSYSTEMD=no])
12-
dnl newer systemd splits libsystemd in slaler libs
13-
AS_IF([test x$HAVE_LIBSYSTEMD = xyes],
14-
[daemon_lib_name=libsystemd],
15-
[daemon_lib_name=libsystemd-daemon])
16-
17-
AS_IF([test x$HAVE_SYSTEMD = xyes],
18-
[PKG_CHECK_MODULES(
19-
[SYSTEMD_DAEMON],
20-
[$daemon_lib_name],
21-
[AC_DEFINE_UNQUOTED([HAVE_SYSTEMD_DAEMON], 1,
22-
[Build with $daemon_lib_name support])
23-
24-
AC_MSG_NOTICE([Will enable systemd socket activation])],
25-
[AC_MSG_NOTICE([Build without $daemon_lib_name support])])],
26-
[AC_MSG_NOTICE([Build without $daemon_lib_name support])])
27-
28-
AM_CONDITIONAL([HAVE_SYSTEMD_DAEMON], [test x"$daemon_lib_name" != x])
4+
PKG_CHECK_MODULES([SYSTEMD_DAEMON],
5+
[libsystemd],
6+
[AC_DEFINE_UNQUOTED([HAVE_SYSTEMD_DAEMON], 1,
7+
[Build with libsystemd support])
8+
HAVE_SYSTEMD_DAEMON=yes
9+
AC_MSG_NOTICE([Build with libsystemd support])],
10+
[HAVE_SYSTEMD_DAEMON=no
11+
AC_MSG_NOTICE([Build without libsystemd support])])
12+
13+
AM_CONDITIONAL([HAVE_SYSTEMD_DAEMON], [test x"$HAVE_SYSTEMD_DAEMON" = xyes])
2914
])

0 commit comments

Comments
 (0)