summaryrefslogtreecommitdiffstats
path: root/php-systemd.patch
diff options
context:
space:
mode:
Diffstat (limited to 'php-systemd.patch')
-rw-r--r--php-systemd.patch49
1 files changed, 49 insertions, 0 deletions
diff --git a/php-systemd.patch b/php-systemd.patch
new file mode 100644
index 0000000..3d2435a
--- /dev/null
+++ b/php-systemd.patch
@@ -0,0 +1,49 @@
+diff --git a/sapi/fpm/config.m4 b/sapi/fpm/config.m4
+index bd6d649..85eff65 100644
+--- a/sapi/fpm/config.m4
++++ b/sapi/fpm/config.m4
+@@ -567,14 +567,26 @@ if test "$PHP_FPM" != "no"; then
+ [ --with-fpm-systemd Activate systemd integration], no, no)
+
+ if test "$PHP_FPM_SYSTEMD" != "no" ; then
+- AC_CHECK_LIB(systemd-daemon, sd_notify, SYSTEMD_LIBS="-lsystemd-daemon")
+- AC_CHECK_HEADERS(systemd/sd-daemon.h, [HAVE_SD_DAEMON_H="yes"], [HAVE_SD_DAEMON_H="no"])
++ if test -z "$PKG_CONFIG"; then
++ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
++ fi
++ unset SYSTEMD_LIBS
++ unset SYSTEMD_INCS
++ if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libsystemd; then
++ SYSTEMD_LIBS=`$PKG_CONFIG --libs libsystemd`
++ SYSTEMD_INCS=`$PKG_CONFIG --cflags-only-I libsystemd`
++ HAVE_SD_DAEMON_H="yes"
++ else
++ AC_CHECK_LIB(systemd-daemon, sd_notify, SYSTEMD_LIBS="-lsystemd-daemon")
++ AC_CHECK_HEADERS(systemd/sd-daemon.h, [HAVE_SD_DAEMON_H="yes"], [HAVE_SD_DAEMON_H="no"])
++ fi
+ if test $HAVE_SD_DAEMON_H = "no" || test -z "${SYSTEMD_LIBS}"; 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_ADD_LIBRARY(systemd-daemon)
++ PHP_EVAL_LIBLINE($SYSTEMD_LIBS)
++ PHP_EVAL_INCLINE($SYSTEMD_INCS)
+ php_fpm_systemd=notify
+ fi
+ else
+--- a/sapi/fpm/config.m4
++++ b/sapi/fpm/config.m4
+@@ -590,9 +590,12 @@
+ unset SYSTEMD_LIBS
+ unset SYSTEMD_INCS
+ if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libsystemd; then
++ AC_MSG_CHECKING([for libsystemd])
+ SYSTEMD_LIBS=`$PKG_CONFIG --libs libsystemd`
+ SYSTEMD_INCS=`$PKG_CONFIG --cflags-only-I libsystemd`
++ SYSTEMD_VERS=`$PKG_CONFIG --modversion libsystemd`
+ HAVE_SD_DAEMON_H="yes"
++ AC_MSG_RESULT([version $SYSTEMD_VERS])
+ else
+ AC_CHECK_LIB(systemd-daemon, sd_notify, SYSTEMD_LIBS="-lsystemd-daemon")
+ AC_CHECK_HEADERS(systemd/sd-daemon.h, [HAVE_SD_DAEMON_H="yes"], [HAVE_SD_DAEMON_H="no"])