diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4 index 638dada40defd..def782ea9759e 100644 --- a/sapi/apache2handler/config.m4 +++ b/sapi/apache2handler/config.m4 @@ -110,11 +110,13 @@ if test "$PHP_APXS2" != "no"; then ;; esac - APACHE_THREADED_MPM=$($APXS_HTTPD -V 2>/dev/null | grep 'threaded:.*yes') - AS_VAR_IF([APACHE_THREADED_MPM],,, [PHP_BUILD_THREAD_SAFE]) + AS_IF([$APXS_HTTPD -V 2>/dev/null | grep 'threaded:.*yes' >/dev/null 2>&1], [ + APACHE_THREADED_MPM=yes + PHP_BUILD_THREAD_SAFE + ], [APACHE_THREADED_MPM=no]) AC_CONFIG_COMMANDS([apache2handler], [AS_VAR_IF([enable_zts], [yes],, - [AS_VAR_IF([APACHE_THREADED_MPM],, + [AS_VAR_IF([APACHE_THREADED_MPM], [no], [AC_MSG_WARN([ +--------------------------------------------------------------------+ | *** WARNING *** | @@ -124,5 +126,5 @@ AC_CONFIG_COMMANDS([apache2handler], [AS_VAR_IF([enable_zts], [yes],, | PHP with --enable-zts | +--------------------------------------------------------------------+ ])])])], - [APACHE_THREADED_MPM=$APACHE_THREADED_MPM; enable_zts=$enable_zts]) + [APACHE_THREADED_MPM="$APACHE_THREADED_MPM"; enable_zts="$enable_zts"]) fi