force feature checks on cli sapi to run when we use embed sapi

Author: henderkes

sapi/cli/config.m4

@@ -5,7 +5,8 @@ PHP_ARG_ENABLE([cli],
   [yes],
   [no])
 
-if test "$PHP_CLI" != "no"; then
+dnl Embed SAPI builds cli files too, so run the feature checks
+if test "$PHP_CLI" != "no" || test "$PHP_EMBED" != "no"; then
   AC_CHECK_FUNCS([setproctitle])
 
   AC_CHECK_HEADERS([sys/pstat.h])
@@ -23,7 +24,9 @@ if test "$PHP_CLI" != "no"; then
     [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.])])
+fi
 
+if test "$PHP_CLI" != "no"; then
   PHP_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/sapi/cli/Makefile.frag])
 
   dnl Set filename.

sapi/embed/config.m4

@@ -1,10 +1,3 @@
-PHP_ARG_ENABLE([embed],,
-  [AS_HELP_STRING([[--enable-embed[=TYPE]]],
-    [Enable building of embedded SAPI library TYPE is either
-    'shared' or 'static'. [TYPE=shared]])],
-  [no],
-  [no])
-
 AC_MSG_CHECKING([for embedded SAPI library support])
 
 if test "$PHP_EMBED" != "no"; then
@@ -39,7 +32,6 @@ if test "$PHP_EMBED" != "no"; then
     PHP_SAPI_OBJS="$PHP_SAPI_OBJS sapi/embed/cli/php_cli.lo sapi/embed/cli/php_http_parser.lo sapi/embed/cli/php_cli_server.lo sapi/embed/cli/ps_title.lo sapi/embed/cli/php_cli_process_title.lo"
 
     PHP_INSTALL_HEADERS([sapi/embed], [php_embed.h])
-    PHP_INSTALL_HEADERS([sapi/cli], [cli.h])
   ])
 else
   AC_MSG_RESULT([no])

sapi/embed/config0.m4

@@ -0,0 +1,7 @@
+dnl Check if embed SAPI is enable before running CLI SAPI feature checks, they are required for embed's do_php_cli too
+PHP_ARG_ENABLE([embed],,
+  [AS_HELP_STRING([[--enable-embed[=TYPE]]],
+    [Enable building of embedded SAPI library TYPE is either
+    'shared' or 'static'. [TYPE=shared]])],
+  [no],
+  [no])