Merge branch 'PHP-7.2'

This commit is contained in:
Jakub Zelenka 2018-04-13 20:13:18 +01:00
commit b7b65fbc7b

View File

@ -630,12 +630,17 @@ if test "$PHP_FPM" != "no"; then
if test "$PHP_FPM_ACL" != "no" ; then
AC_CHECK_HEADERS([sys/acl.h])
dnl *BSD has acl_* built into libc
AC_CHECK_FUNC(acl_free, [
AC_DEFINE(HAVE_FPM_ACL, 1, [ POSIX Access Control List ])
],[
AC_CHECK_LIB(acl, acl_free, [
PHP_ADD_LIBRARY(acl)
AC_DEFINE(HAVE_FPM_ACL, 1, [ POSIX Access Control List ])
],[
AC_MSG_ERROR(libacl required not found)
])
])
fi
PHP_SUBST_OLD(php_fpm_systemd)