From a071d1c9cf62ad1ef8bc10e958f5ba7354493112 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Tue, 2 Jul 2024 12:37:33 +0200 Subject: [PATCH] Autotools: Refactor PS_STRINGS check in cli (#14763) - over-quoted arguments reduced - AS_VAR_IF used - php_cv_var_PS_STRINGS cache variable name used instead of cli_cv_* - Macro help text synced according to empty definition --- sapi/cli/config.m4 | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/sapi/cli/config.m4 b/sapi/cli/config.m4 index ac2d5658bf6..43cb8c3367f 100644 --- a/sapi/cli/config.m4 +++ b/sapi/cli/config.m4 @@ -9,17 +9,16 @@ AC_CHECK_FUNCS([setproctitle]) AC_CHECK_HEADERS([sys/pstat.h]) -AC_CACHE_CHECK([for PS_STRINGS], [cli_cv_var_PS_STRINGS], -[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include +AC_CACHE_CHECK([for PS_STRINGS], [php_cv_var_PS_STRINGS], +[AC_LINK_IFELSE([AC_LANG_PROGRAM([#include #include -]], -[[PS_STRINGS->ps_nargvstr = 1; -PS_STRINGS->ps_argvstr = "foo";]])], -[cli_cv_var_PS_STRINGS=yes], -[cli_cv_var_PS_STRINGS=no])]) -if test "$cli_cv_var_PS_STRINGS" = yes ; then - AC_DEFINE([HAVE_PS_STRINGS], [], [Define to 1 if the PS_STRINGS thing exists.]) -fi +], +[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)