diff --git a/www/mod_php4/Makefile b/www/mod_php4/Makefile index 4eede4b0f597..27264d970100 100644 --- a/www/mod_php4/Makefile +++ b/www/mod_php4/Makefile @@ -37,12 +37,6 @@ SLAVEDIRS= lang/php4 USE_BZIP2= yes USE_SUBMAKE= yes USE_AUTOCONF_VER=213 - -.include -.if exists(${LOCALBASE}/include/apache2/apr.h) -WITH_APACHE2= yes -.endif - .if defined(WITH_APACHE2) APACHE_PORT?= ${PORTSDIR}/www/apache2 .else @@ -91,14 +85,9 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ pre-fetch: @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.php -.if !defined(STANDALONE) -.if !defined(WITH_APACHE2) +.if !defined(STANDALONE) && !defined(WITH_APACHE2) @${ECHO_CMD} "Define WITH_APACHE2 to build mod_php4 as an apache2 module." @${ECHO_CMD} "" -.else - @${ECHO_CMD} "Building mod_php4 as an apache2 module." - @${ECHO_CMD} "" -.endif .endif post-install: @@ -131,4 +120,4 @@ post-clean: .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif -.include +.include diff --git a/www/mod_php5/Makefile b/www/mod_php5/Makefile index 4eede4b0f597..27264d970100 100644 --- a/www/mod_php5/Makefile +++ b/www/mod_php5/Makefile @@ -37,12 +37,6 @@ SLAVEDIRS= lang/php4 USE_BZIP2= yes USE_SUBMAKE= yes USE_AUTOCONF_VER=213 - -.include -.if exists(${LOCALBASE}/include/apache2/apr.h) -WITH_APACHE2= yes -.endif - .if defined(WITH_APACHE2) APACHE_PORT?= ${PORTSDIR}/www/apache2 .else @@ -91,14 +85,9 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ pre-fetch: @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.php -.if !defined(STANDALONE) -.if !defined(WITH_APACHE2) +.if !defined(STANDALONE) && !defined(WITH_APACHE2) @${ECHO_CMD} "Define WITH_APACHE2 to build mod_php4 as an apache2 module." @${ECHO_CMD} "" -.else - @${ECHO_CMD} "Building mod_php4 as an apache2 module." - @${ECHO_CMD} "" -.endif .endif post-install: @@ -131,4 +120,4 @@ post-clean: .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif -.include +.include