Skip to content

Autotools: Use FPM_EXTRA_LIBS for SELinux library #14885

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

Merged
merged 1 commit into from
Jul 12, 2024
Merged

Autotools: Use FPM_EXTRA_LIBS for SELinux library #14885

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
23 changes: 12 additions & 11 deletions sapi/fpm/config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,8 @@ if test "$PHP_FPM" != "no"; then
[no],
[no])

PHP_ARG_WITH([fpm-selinux],,
PHP_ARG_WITH([fpm-selinux],
[whether to enable SELinux support in PHP-FPM],
[AS_HELP_STRING([--with-fpm-selinux],
[Support SELinux policy library])],
[no],
Expand Down Expand Up @@ -498,23 +499,23 @@ if test "$PHP_FPM" != "no"; then
CFLAGS="$CFLAGS_save"
fi

if test "x$PHP_FPM_SELINUX" != "xno" ; then
PKG_CHECK_MODULES([SELINUX], [libselinux], [
PHP_EVAL_LIBLINE([$SELINUX_LIBS])
PHP_EVAL_INCLINE([$SELINUX_CFLAGS])
],
AS_VAR_IF([PHP_FPM_SELINUX], [no],, [
PKG_CHECK_MODULES([SELINUX], [libselinux],
[PHP_EVAL_INCLINE([$SELINUX_CFLAGS])],
[AC_CHECK_LIB([selinux], [security_setenforce],
[PHP_ADD_LIBRARY([selinux])],
[SELINUX_LIBS=-lselinux],
[AC_MSG_ERROR([Required SELinux library not found.])])])
PHP_EVAL_LIBLINE([$SELINUX_LIBS], [FPM_EXTRA_LIBS], [yes])

dnl Sanity check.
CFLAGS_save="$CFLAGS"
CFLAGS_save=$CFLAGS
CFLAGS="$INCLUDES $CFLAGS"
AC_CHECK_HEADER([selinux/selinux.h],
[AC_DEFINE([HAVE_SELINUX], [1], [Whether SELinux is available.])],
[AC_DEFINE([HAVE_SELINUX], [1],
[Define to 1 if SELinux is available in PHP-FPM.])],
[AC_MSG_ERROR([Required selinux/selinux.h not found.])])
CFLAGS="$CFLAGS_save"
fi
CFLAGS=$CFLAGS_save
])

AC_SUBST([php_fpm_systemd])

Expand Down
Loading