diff options
| author | Remi Collet <remi@php.net> | 2014-07-20 11:15:59 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2014-07-20 11:15:59 +0200 |
| commit | d55f23ea5a5565fa0f0439e0fa5706dcf49aa6af (patch) | |
| tree | 21c91ff4d2a595149f66413baaf984e9e2abf93d | |
| parent | 0ec8f1997590fcea80437ab02dd8802c85579428 (diff) | |
| parent | 658f7d77f9eb447ecc2f9812d46b4c07bb99b16d (diff) | |
| download | php-git-d55f23ea5a5565fa0f0439e0fa5706dcf49aa6af.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
See bug #67635
| -rw-r--r-- | sapi/fpm/config.m4 | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/sapi/fpm/config.m4 b/sapi/fpm/config.m4 index fa9aaa6e94..9c10aa6be2 100644 --- a/sapi/fpm/config.m4 +++ b/sapi/fpm/config.m4 @@ -589,17 +589,29 @@ if test "$PHP_FPM" != "no"; then fi unset SYSTEMD_LIBS unset SYSTEMD_INCS + if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libsystemd; then + dnl systemd version >= 209 provides libsystemd 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]) + + elif test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libsystemd-daemon; then + dnl systemd version < 209 provides libsystemd-daemon + AC_MSG_CHECKING([for libsystemd-daemon]) + SYSTEMD_LIBS=`$PKG_CONFIG --libs libsystemd-daemon` + SYSTEMD_INCS=`$PKG_CONFIG --cflags-only-I libsystemd-daemon` + SYSTEMD_VERS=`$PKG_CONFIG --modversion libsystemd-daemon` + AC_MSG_RESULT([version $SYSTEMD_VERS]) + else + dnl failback when no pkg-config 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 + + AC_CHECK_HEADERS(systemd/sd-daemon.h, [HAVE_SD_DAEMON_H="yes"], [HAVE_SD_DAEMON_H="no"]) if test $HAVE_SD_DAEMON_H = "no" || test -z "${SYSTEMD_LIBS}"; then AC_MSG_ERROR([Your system does not support systemd.]) else |