diff options
| author | Remi Collet <remi@php.net> | 2014-07-19 18:47:32 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2014-07-19 18:47:32 +0200 |
| commit | 6055a53d34c445c7268ed3759854c8163653d1e7 (patch) | |
| tree | 32165b0bf68be0ab85b939ba7576e002f5a6bb7f | |
| parent | 1c0e22f50c70cdcd62c4b8ccae0ca5ecd7c0ad26 (diff) | |
| parent | 0ec8f1997590fcea80437ab02dd8802c85579428 (diff) | |
| download | php-git-6055a53d34c445c7268ed3759854c8163653d1e7.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
NEWS
NEWS
improve previous, add message during configure
Fixed bug #67635 php links to systemd libraries without using pkg-config
| -rw-r--r-- | sapi/fpm/config.m4 | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/sapi/fpm/config.m4 b/sapi/fpm/config.m4 index 40cd69c719..fa9aaa6e94 100644 --- a/sapi/fpm/config.m4 +++ b/sapi/fpm/config.m4 @@ -584,14 +584,29 @@ 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 + 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"]) + 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 |