Skip to content

Commit 10ed74e

Browse files
authored
Autotools: Check cli SAPI configure checks conditionally (#15370)
This checks cli SAPI system configuration based on whether the cli is enabled like with other SAPIs and extensions.
1 parent 3b24b85 commit 10ed74e

File tree

1 file changed

+16
-13
lines changed

1 file changed

+16
-13
lines changed

sapi/cli/config.m4

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,25 @@ PHP_ARG_ENABLE([cli],
55
[yes],
66
[no])
77

8-
AC_CHECK_FUNCS([setproctitle])
8+
if test "$PHP_CLI" != "no"; then
9+
AC_CHECK_FUNCS([setproctitle])
910

10-
AC_CHECK_HEADERS([sys/pstat.h])
11+
AC_CHECK_HEADERS([sys/pstat.h])
1112

12-
AC_CACHE_CHECK([for PS_STRINGS], [php_cv_var_PS_STRINGS],
13-
[AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <machine/vmparam.h>
14-
#include <sys/exec.h>
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.])])
13+
AC_CACHE_CHECK([for PS_STRINGS], [php_cv_var_PS_STRINGS],
14+
[AC_LINK_IFELSE([AC_LANG_PROGRAM([
15+
#include <machine/vmparam.h>
16+
#include <sys/exec.h>
17+
],
18+
[
19+
PS_STRINGS->ps_nargvstr = 1;
20+
PS_STRINGS->ps_argvstr = "foo";
21+
])],
22+
[php_cv_var_PS_STRINGS=yes],
23+
[php_cv_var_PS_STRINGS=no])])
24+
AS_VAR_IF([php_cv_var_PS_STRINGS], [yes],
25+
[AC_DEFINE([HAVE_PS_STRINGS], [], [Define if the PS_STRINGS exists.])])
2226

23-
if test "$PHP_CLI" != "no"; then
2427
PHP_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/sapi/cli/Makefile.frag])
2528

2629
dnl Set filename.

0 commit comments

Comments
 (0)