From 8d7364f0bbb9a6d53dd812202d11fca2da5f37d8 Mon Sep 17 00:00:00 2001
From: Peter Kokot <peterkokot@gmail.com>
Date: Thu, 11 Jan 2024 00:02:28 +0100
Subject: [PATCH] Align configure check message results together

---
 ext/opcache/config.m4 |  2 +-
 sapi/fpm/config.m4    | 15 +++++----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4
index 5fe97c53220..4bab4f21bc5 100644
--- a/ext/opcache/config.m4
+++ b/ext/opcache/config.m4
@@ -300,11 +300,11 @@ int main(void) {
   return 0;
 }
 ]])],[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
     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)])
   fi
-  AC_MSG_RESULT([$have_shm_mmap_posix])
 
   PHP_NEW_EXTENSION(opcache,
 	ZendAccelerator.c \
diff --git a/sapi/fpm/config.m4 b/sapi/fpm/config.m4
index 75fc8e558ab..26ed211a242 100644
--- a/sapi/fpm/config.m4
+++ b/sapi/fpm/config.m4
@@ -575,7 +575,6 @@ if test "$PHP_FPM" != "no"; then
   fi
 
   if test "$PHP_FPM_ACL" != "no" ; then
-    AC_MSG_CHECKING([for acl user/group permissions support])
     AC_CHECK_HEADERS([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,
         [PHP_ADD_LIBRARY(acl)
           have_fpm_acl=yes
-          AC_MSG_RESULT([yes])
         ],[
           AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <sys/acl.h>
             int main(void)
@@ -610,21 +608,18 @@ if test "$PHP_FPM" != "no"; then
               acl_free(acl);
               return 0;
             }
-          ]])], [
-            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=yes],[have_fpm_acl=no],[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
+      AC_MSG_RESULT([yes])
       AC_DEFINE([HAVE_FPM_ACL], 1, [do we have acl support?])
+    else
+      AC_MSG_RESULT([no])
     fi
   fi