Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CFE-4274: In configure.ac, force with-systemd-socket=no when with-systemd-service=no #5425

Merged
merged 1 commit into from
Jan 18, 2024
Merged

CFE-4274: In configure.ac, force with-systemd-socket=no when with-systemd-service=no #5425

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 16 additions & 13 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,19 +525,6 @@ dnl defined for libntech

AC_DEFINE(WITH_PCRE2, 1, [Define if PCRE2 is being used])

dnl systemd-socket activation

AC_ARG_WITH([systemd-socket], [AS_HELP_STRING([--with-systemd-socket[[=PATH]]], [support systemd socket activation])], [], [with_systemd_socket=check])


if test "x$with_systemd_socket" != xno
then
CF3_WITH_LIBRARY(systemd_socket, [
AC_CHECK_LIB(systemd, sd_listen_fds, [], [if test "x$with_systemd_socket" != xcheck; then AC_MSG_ERROR(Cannot find systemd library); fi])
AC_CHECK_LIB(systemd, sd_notify_barrier, [AC_DEFINE([HAVE_SD_NOTIFY_BARRIER],[1],[sd_notify_barrier on recent systemd])])
AC_CHECK_HEADERS(systemd/sd-daemon.h, [], [if test "x$with_systemd_socket" != xcheck; then AC_MSG_ERROR(Cannot find systemd headers); fi])
])
fi

dnl libvirt

Expand Down Expand Up @@ -1611,6 +1598,22 @@ else
fi
AC_SUBST([OS_ENVIRONMENT_PATH])

dnl systemd-socket activation

AC_ARG_WITH([systemd-socket], [AS_HELP_STRING([--with-systemd-socket[[=PATH]]], [support systemd socket activation])], [], [with_systemd_socket=check])

dnl ########################################################################
dnl systemd socket feature, only available if systemd init scripts requested
dnl ########################################################################
if test "x$with_systemd_service" != xno && test "x$with_systemd_socket" != xno
craigcomstock marked this conversation as resolved.
Show resolved Hide resolved
then
CF3_WITH_LIBRARY(systemd_socket, [
AC_CHECK_LIB(systemd, sd_listen_fds, [], [if test "x$with_systemd_socket" != xcheck; then AC_MSG_ERROR(Cannot find systemd library); fi])
AC_CHECK_LIB(systemd, sd_notify_barrier, [AC_DEFINE([HAVE_SD_NOTIFY_BARRIER],[1],[sd_notify_barrier on recent systemd])])
AC_CHECK_HEADERS(systemd/sd-daemon.h, [], [if test "x$with_systemd_socket" != xcheck; then AC_MSG_ERROR(Cannot find systemd headers); fi])
])
fi

dnl #####################################################################
dnl SELinux policy build and installation
dnl #####################################################################
Expand Down
Loading