com php-src: Fixed bug #67635 php links to systemd libraries without using pkg-config: sapi/fpm/config.m4

Commit: 7b6031567251ad47132de23f47eb57951fd9b563 Author: Remi Collet <remi@php.net> Sat, 19 Jul 2014 18:40:20 +0200 Parents: 8ff00e6e85669ad0a5a47421fe639b6fb6f91669 Branches: PHP-5.5 PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7b6031567251ad47132de23f47eb57951fd9b563 Log: Fixed bug #67635 php links to systemd libraries without using pkg-config Patch from pacho at gentoo dot org Rely on pkg-config for systemd >= 209 Failback on old check Bugs: https://bugs.php.net/67635 Changed paths: M sapi/fpm/config.m4 Diff: diff --git a/sapi/fpm/config.m4 b/sapi/fpm/config.m4 index bd6d649..e1c740d 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