archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Autotools: Use FPM_EXTRA_LIBS for systemd library (#14883)

Browse source 
Instead of appending -lsystemd to global LIBS variable, this adds it as
needed only to FPM_EXTRA_LIBS as it was already used in the BUILD_FPM
invocation. Move php_fpm_systemd substitution after its check.

Follow-up of GH-14881
This commit is contained in:
Peter Kokot 2024-07-13 01:19:16 +02:00 • committed by GitHub
parent 1a07bb9252
commit 3dd0c11cc3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

23
sapi/fpm/config.m4
View file

@ -406,7 +406,8 @@ if test "$PHP_FPM" != "no"; then
[nobody],
[no])
PHP_ARG_WITH([fpm-systemd],,
PHP_ARG_WITH([fpm-systemd],
[whether to enable systemd integration in PHP-FPM],
[AS_HELP_STRING([--with-fpm-systemd],
[Activate systemd integration])],
[no],
@ -431,24 +432,26 @@ if test "$PHP_FPM" != "no"; then
[no],
[no])
if test "$PHP_FPM_SYSTEMD" != "no" ; then
AS_VAR_IF([PHP_FPM_SYSTEMD], [no], [php_fpm_systemd=simple], [
PKG_CHECK_MODULES([SYSTEMD], [libsystemd >= 209])
AC_DEFINE([HAVE_SYSTEMD], [1], [Whether FPM has systemd integration])
AC_DEFINE([HAVE_SYSTEMD], [1],
[Define to 1 if FPM has systemd integration.])
PHP_FPM_SD_FILES="fpm/fpm_systemd.c"
PHP_EVAL_LIBLINE([$SYSTEMD_LIBS])
PHP_EVAL_LIBLINE([$SYSTEMD_LIBS], [FPM_EXTRA_LIBS], [yes])
PHP_EVAL_INCLINE([$SYSTEMD_CFLAGS])
php_fpm_systemd=notify
dnl Sanity check.
CFLAGS_save="$CFLAGS"
CFLAGS_save=$CFLAGS
CFLAGS="$INCLUDES $CFLAGS"
AC_CHECK_HEADER([systemd/sd-daemon.h],,
[AC_MSG_ERROR([Required systemd/sd-daemon.h not found.])])
CFLAGS="$CFLAGS_save"
else
php_fpm_systemd=simple
fi
CFLAGS=$CFLAGS_save
])
AC_SUBST([php_fpm_systemd])
AS_VAR_IF([PHP_FPM_ACL], [no],, [
AC_CHECK_HEADERS([sys/acl.h])
@ -516,8 +519,6 @@ if test "$PHP_FPM" != "no"; then
CFLAGS="$CFLAGS_save"
fi
AC_SUBST([php_fpm_systemd])
if test -z "$PHP_FPM_USER" || test "$PHP_FPM_USER" = "yes" || test "$PHP_FPM_USER" = "no"; then
php_fpm_user="nobody"
else