From 332a4180a57a6d5a78cd0b9d19c7e50c931abdc1 Mon Sep 17 00:00:00 2001
From: Peter Kokot <peterkokot@gmail.com>
Date: Tue, 13 Aug 2024 01:20:54 +0200
Subject: [PATCH] Autotools: Check cli SAPI configure checks conditionally

This checks cli SAPI system configuration based on whether the cli is
enabled like with other SAPIs and extensions.
---
 sapi/cli/config.m4 | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/sapi/cli/config.m4 b/sapi/cli/config.m4
index 8da2c44e3bf3..5b81106064f9 100644
--- a/sapi/cli/config.m4
+++ b/sapi/cli/config.m4
@@ -5,22 +5,25 @@ PHP_ARG_ENABLE([cli],
   [yes],
   [no])
 
-AC_CHECK_FUNCS([setproctitle])
+if test "$PHP_CLI" != "no"; then
+  AC_CHECK_FUNCS([setproctitle])
 
-AC_CHECK_HEADERS([sys/pstat.h])
+  AC_CHECK_HEADERS([sys/pstat.h])
 
-AC_CACHE_CHECK([for PS_STRINGS], [php_cv_var_PS_STRINGS],
-[AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <machine/vmparam.h>
-#include <sys/exec.h>
-],
-[PS_STRINGS->ps_nargvstr = 1;
-PS_STRINGS->ps_argvstr = "foo";])],
-[php_cv_var_PS_STRINGS=yes],
-[php_cv_var_PS_STRINGS=no])])
-AS_VAR_IF([php_cv_var_PS_STRINGS], [yes],
-  [AC_DEFINE([HAVE_PS_STRINGS], [], [Define if the PS_STRINGS exists.])])
+  AC_CACHE_CHECK([for PS_STRINGS], [php_cv_var_PS_STRINGS],
+    [AC_LINK_IFELSE([AC_LANG_PROGRAM([
+      #include <machine/vmparam.h>
+      #include <sys/exec.h>
+    ],
+    [
+      PS_STRINGS->ps_nargvstr = 1;
+      PS_STRINGS->ps_argvstr = "foo";
+    ])],
+    [php_cv_var_PS_STRINGS=yes],
+    [php_cv_var_PS_STRINGS=no])])
+  AS_VAR_IF([php_cv_var_PS_STRINGS], [yes],
+    [AC_DEFINE([HAVE_PS_STRINGS], [], [Define if the PS_STRINGS exists.])])
 
-if test "$PHP_CLI" != "no"; then
   PHP_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/sapi/cli/Makefile.frag])
 
   dnl Set filename.