From fd43a3db8d807d87812997db5005f0f6ab63a34e Mon Sep 17 00:00:00 2001
From: Peter Kokot <peterkokot@gmail.com>
Date: Tue, 5 Mar 2024 12:48:32 +0100
Subject: [PATCH] Refactor systemd library check for FPM

This removes the unused HAVE_SYSTEMD_SD_DAEMON_H symbol defined by the
Autoconf AC_CHECK_HEADERS macro.

The systemd/sd-daemon.h sanity check now also works when systemd library
is overriden by pkgconf variables for custom or development places:

./configure --enable-fpm --with-fpm-systemd \
  SYSTEMD_CFLAGS=-I/path/to/systemd/src \
  SYSTEMD_LIBS="-L/path/to/systemd/build -lsystemd"
---
 sapi/fpm/config.m4 | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/sapi/fpm/config.m4 b/sapi/fpm/config.m4
index 51de63df75a80..1173fdb1e69ac 100644
--- a/sapi/fpm/config.m4
+++ b/sapi/fpm/config.m4
@@ -472,16 +472,18 @@ if test "$PHP_FPM" != "no"; then
   if test "$PHP_FPM_SYSTEMD" != "no" ; then
     PKG_CHECK_MODULES([SYSTEMD], [libsystemd >= 209])
 
-    AC_CHECK_HEADERS(systemd/sd-daemon.h, [HAVE_SD_DAEMON_H="yes"], [HAVE_SD_DAEMON_H="no"])
-    if test $HAVE_SD_DAEMON_H = "no"; then
-      AC_MSG_ERROR([Your system does not support systemd.])
-    else
-      AC_DEFINE(HAVE_SYSTEMD, 1, [FPM use systemd integration])
-      PHP_FPM_SD_FILES="fpm/fpm_systemd.c"
-      PHP_EVAL_LIBLINE($SYSTEMD_LIBS)
-      PHP_EVAL_INCLINE($SYSTEMD_CFLAGS)
-      php_fpm_systemd=notify
-    fi
+    AC_DEFINE([HAVE_SYSTEMD], [1], [Whether FPM has systemd integration])
+    PHP_FPM_SD_FILES="fpm/fpm_systemd.c"
+    PHP_EVAL_LIBLINE([$SYSTEMD_LIBS])
+    PHP_EVAL_INCLINE([$SYSTEMD_CFLAGS])
+    php_fpm_systemd=notify
+
+    dnl Sanity check.
+    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