kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't check value for WITH_/WITHOUT_ vars, especially for "yes"

Browse source 
Just relay on they are set.

PR:             127464
This commit is contained in:
Andrey A. Chernov 2008-09-23 12:34:37 +00:00
parent 55aeb58ad1
commit d1ee96f817
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=220550
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
www/apache13/Makefile
View file

@ -45,16 +45,16 @@ CGIBIN_ROOT=${DATADIR}/cgi-bin
.endif
DEFAULT_PATH=/bin:/usr/bin:${PREFIX}/bin
.if defined(WITHOUT_APACHE_EXPAT) && ${WITHOUT_APACHE_EXPAT} == yes
.if defined(WITHOUT_APACHE_EXPAT)
EXPAT_CONF+= --disable-rule=EXPAT
.else
.if !defined(WITH_APACHE_INTERNAL_EXPAT) || ${WITH_APACHE_INTERNAL_EXPAT} != yes
.if !defined(WITH_APACHE_INTERNAL_EXPAT)
LIB_DEPENDS+= expat.6:${PORTSDIR}/textproc/expat2
.endif
EXPAT_CONF+= --enable-rule=EXPAT
.endif
.if defined(WITH_APACHE_SUEXEC) && ${WITH_APACHE_SUEXEC} == yes
.if defined(WITH_APACHE_SUEXEC)
APACHE_SUEXEC_DOCROOT?=${DOCUMENT_ROOT}
APACHE_SUEXEC_LOG?=/var/log/httpd-suexec.log
@ -128,9 +128,9 @@ CFLAGS+=-DHARD_SERVER_LIMIT=512
.endif
#
# Set WITH_APACHE_PERF_TUNING env. variable to yes to get maximum performance
# Set WITH_APACHE_PERF_TUNING env. variable to get maximum performance
#
.if defined(WITH_APACHE_PERF_TUNING) && ${WITH_APACHE_PERF_TUNING} == yes
.if defined(WITH_APACHE_PERF_TUNING)
CFLAGS+=-DBUFFERED_LOGS
# Don't use OPTIM below, it is inserted _before_ CFLAGS
CFLAGS+=-O3
@ -138,8 +138,7 @@ CFLAGS+=-O3
CONFIGURE_ENV= OPTIM='${OPTIM}' LD_SHLIB='${CC}' LIBS='${LIBS}'
.if (!defined(WITHOUT_APACHE_EXPAT) || ${WITHOUT_APACHE_EXPAT} != yes) && \
(!defined(WITH_APACHE_INTERNAL_EXPAT) || ${WITH_APACHE_INTERNAL_EXPAT} != yes)
.if !defined(WITHOUT_APACHE_EXPAT) && !defined(WITH_APACHE_INTERNAL_EXPAT)
CONFIGURE_ENV+= \
INCLUDES=-I${LOCALBASE}/include \
LDFLAGS=-L${LOCALBASE}/lib