Skip to content

Commit a071d1c

Browse files
authored
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
1 parent fa5e29f commit a071d1c

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

sapi/cli/config.m4

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,16 @@ AC_CHECK_FUNCS([setproctitle])
99

1010
AC_CHECK_HEADERS([sys/pstat.h])
1111

12-
AC_CACHE_CHECK([for PS_STRINGS], [cli_cv_var_PS_STRINGS],
13-
[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <machine/vmparam.h>
12+
AC_CACHE_CHECK([for PS_STRINGS], [php_cv_var_PS_STRINGS],
13+
[AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <machine/vmparam.h>
1414
#include <sys/exec.h>
15-
]],
16-
[[PS_STRINGS->ps_nargvstr = 1;
17-
PS_STRINGS->ps_argvstr = "foo";]])],
18-
[cli_cv_var_PS_STRINGS=yes],
19-
[cli_cv_var_PS_STRINGS=no])])
20-
if test "$cli_cv_var_PS_STRINGS" = yes ; then
21-
AC_DEFINE([HAVE_PS_STRINGS], [], [Define to 1 if the PS_STRINGS thing exists.])
22-
fi
15+
],
16+
[PS_STRINGS->ps_nargvstr = 1;
17+
PS_STRINGS->ps_argvstr = "foo";])],
18+
[php_cv_var_PS_STRINGS=yes],
19+
[php_cv_var_PS_STRINGS=no])])
20+
AS_VAR_IF([php_cv_var_PS_STRINGS], [yes],
21+
[AC_DEFINE([HAVE_PS_STRINGS], [], [Define if the PS_STRINGS exists.])])
2322

2423
if test "$PHP_CLI" != "no"; then
2524
PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/cli/Makefile.frag)

0 commit comments

Comments
 (0)