com php-src: improve previous, add message during configure: sapi/fpm/config.m4
| From: | Remi Collet | Date: | Sat, 19 Jul 2014 16:42:40 +0000 |
| Subject: | com php-src: improve previous, add message during configure: sapi/fpm/config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79530@lists.php.net to get a copy of this message | ||
Commit: 144a08395408506fa700c71e74c360160da3bd99
Author: Remi Collet <remi@php.net> Sat, 19 Jul 2014 18:42:40 +0200
Parents: 7b6031567251ad47132de23f47eb57951fd9b563
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=144a08395408506fa700c71e74c360160da3bd99
Log:
improve previous, add message during configure
Changed paths:
M sapi/fpm/config.m4
Diff:
diff --git a/sapi/fpm/config.m4 b/sapi/fpm/config.m4
index e1c740d...96b0edf 100644
--- a/sapi/fpm/config.m4
+++ b/sapi/fpm/config.m4
@@ -573,9 +573,12 @@ if test "$PHP_FPM" != "no"; then
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"])