Skip to content

Commit 8d7364f

Browse files
committed
Align configure check message results together
1 parent 9726721 commit 8d7364f

File tree

2 files changed

+6
-11
lines changed

2 files changed

+6
-11
lines changed

ext/opcache/config.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,11 +300,11 @@ int main(void) {
300300
return 0;
301301
}
302302
]])],[have_shm_mmap_posix=yes],[have_shm_mmap_posix=no],[have_shm_mmap_posix=no])
303+
AC_MSG_RESULT([$have_shm_mmap_posix])
303304
if test "$have_shm_mmap_posix" = "yes"; then
304305
AC_DEFINE(HAVE_SHM_MMAP_POSIX, 1, [Define if you have POSIX mmap() SHM support])
305306
PHP_CHECK_LIBRARY(rt, shm_unlink, [PHP_ADD_LIBRARY(rt,1,OPCACHE_SHARED_LIBADD)])
306307
fi
307-
AC_MSG_RESULT([$have_shm_mmap_posix])
308308

309309
PHP_NEW_EXTENSION(opcache,
310310
ZendAccelerator.c \

sapi/fpm/config.m4

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,6 @@ if test "$PHP_FPM" != "no"; then
575575
fi
576576

577577
if test "$PHP_FPM_ACL" != "no" ; then
578-
AC_MSG_CHECKING([for acl user/group permissions support])
579578
AC_CHECK_HEADERS([sys/acl.h])
580579

581580
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <sys/acl.h>
@@ -595,7 +594,6 @@ if test "$PHP_FPM" != "no"; then
595594
AC_CHECK_LIB(acl, acl_free,
596595
[PHP_ADD_LIBRARY(acl)
597596
have_fpm_acl=yes
598-
AC_MSG_RESULT([yes])
599597
],[
600598
AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <sys/acl.h>
601599
int main(void)
@@ -610,21 +608,18 @@ if test "$PHP_FPM" != "no"; then
610608
acl_free(acl);
611609
return 0;
612610
}
613-
]])], [
614-
have_fpm_acl=yes
615-
AC_MSG_RESULT([yes])
616-
], [
617-
have_fpm_acl=no
618-
AC_MSG_RESULT([no])
619-
], [AC_MSG_RESULT([skipped (cross-compiling)])])
611+
]])],[have_fpm_acl=yes],[have_fpm_acl=no],[have_fpm_acl=no])
620612
])
621613
], [
622614
have_fpm_acl=no
623-
AC_MSG_RESULT([no])
624615
])
625616

617+
AC_MSG_CHECKING([for acl user/group permissions support])
626618
if test "$have_fpm_acl" = "yes"; then
619+
AC_MSG_RESULT([yes])
627620
AC_DEFINE([HAVE_FPM_ACL], 1, [do we have acl support?])
621+
else
622+
AC_MSG_RESULT([no])
628623
fi
629624
fi
630625

0 commit comments

Comments
 (0)