svn commit: r319224 - head/Mk

[Alex Dupre]

Author: ale
Date: Mon May 27 12:32:13 2013
New Revision: 319224
URL: http://svnweb.freebsd.org/changeset/ports/319224

Log:
  Rework check for threaded apache, in order to support apache 2.4.

Modified:
  head/Mk/bsd.php.mk

Modified: head/Mk/bsd.php.mk
==============================================================================
--- head/Mk/bsd.php.mk	Mon May 27 12:31:03 2013	(r319223)
+++ head/Mk/bsd.php.mk	Mon May 27 12:32:13 2013	(r319224)
@@ -60,9 +60,8 @@ PHP_EXT_INC=	pcre spl
 
 HTTPD?=		${LOCALBASE}/sbin/httpd
 .if exists(${HTTPD})
-APXS?=		${LOCALBASE}/sbin/apxs
-APACHE_MPM!=	${APXS} -q MPM_NAME
-.	if ${APACHE_MPM} == "worker" || ${APACHE_MPM} == "event"
+APACHE_THR!=	${HTTPD} -V | ${GREP} threaded
+.	if ${APACHE_THR:Myes}
 PHP_EXT_DIR:=	${PHP_EXT_DIR}-zts
 .	endif
 .elif defined(APACHE_PORT) && (${APACHE_PORT:M*worker*} != "" || ${APACHE_PORT:M*event*} != "")