php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Align configure check message results together

Browse Source
This commit is contained in:
Peter Kokot
2024-01-11 00:02:28 +01:00
parent 9726721560
commit 8d7364f0bb
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ext/opcache/config.m4
View File

@@ -300,11 +300,11 @@ int main(void) {
return 0; return 0;
} }
]])],[have_shm_mmap_posix=yes],[have_shm_mmap_posix=no],[have_shm_mmap_posix=no]) ]])],[have_shm_mmap_posix=yes],[have_shm_mmap_posix=no],[have_shm_mmap_posix=no])
AC_MSG_RESULT([$have_shm_mmap_posix])
if test "$have_shm_mmap_posix" = "yes"; then if test "$have_shm_mmap_posix" = "yes"; then
AC_DEFINE(HAVE_SHM_MMAP_POSIX, 1, [Define if you have POSIX mmap() SHM support]) AC_DEFINE(HAVE_SHM_MMAP_POSIX, 1, [Define if you have POSIX mmap() SHM support])
PHP_CHECK_LIBRARY(rt, shm_unlink, [PHP_ADD_LIBRARY(rt,1,OPCACHE_SHARED_LIBADD)]) PHP_CHECK_LIBRARY(rt, shm_unlink, [PHP_ADD_LIBRARY(rt,1,OPCACHE_SHARED_LIBADD)])
fi fi
AC_MSG_RESULT([$have_shm_mmap_posix])
PHP_NEW_EXTENSION(opcache, PHP_NEW_EXTENSION(opcache,
ZendAccelerator.c \ ZendAccelerator.c \

15
sapi/fpm/config.m4
View File

@@ -575,7 +575,6 @@ if test "$PHP_FPM" != "no"; then
fi fi
if test "$PHP_FPM_ACL" != "no" ; then if test "$PHP_FPM_ACL" != "no" ; then
AC_MSG_CHECKING([for acl user/group permissions support])
AC_CHECK_HEADERS([sys/acl.h]) AC_CHECK_HEADERS([sys/acl.h])
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <sys/acl.h> AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <sys/acl.h>
@@ -595,7 +594,6 @@ if test "$PHP_FPM" != "no"; then
AC_CHECK_LIB(acl, acl_free, AC_CHECK_LIB(acl, acl_free,
[PHP_ADD_LIBRARY(acl) [PHP_ADD_LIBRARY(acl)
have_fpm_acl=yes have_fpm_acl=yes
AC_MSG_RESULT([yes])
],[ ],[
AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <sys/acl.h> AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <sys/acl.h>
int main(void) int main(void)
@@ -610,21 +608,18 @@ if test "$PHP_FPM" != "no"; then
acl_free(acl); acl_free(acl);
return 0; return 0;
} }
]])], [ ]])],[have_fpm_acl=yes],[have_fpm_acl=no],[have_fpm_acl=no])
have_fpm_acl=yes
AC_MSG_RESULT([yes])
], [
have_fpm_acl=no
AC_MSG_RESULT([no])
], [AC_MSG_RESULT([skipped (cross-compiling)])])
]) ])
], [ ], [
have_fpm_acl=no have_fpm_acl=no
AC_MSG_RESULT([no])
]) ])
AC_MSG_CHECKING([for acl user/group permissions support])
if test "$have_fpm_acl" = "yes"; then if test "$have_fpm_acl" = "yes"; then
AC_MSG_RESULT([yes])
AC_DEFINE([HAVE_FPM_ACL], 1, [do we have acl support?]) AC_DEFINE([HAVE_FPM_ACL], 1, [do we have acl support?])
else
AC_MSG_RESULT([no])
fi fi
fi fi