diff options
| author | ache <ache@FreeBSD.org> | 2008-09-23 20:34:37 +0800 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 2008-09-23 20:34:37 +0800 |
| commit | a968aaf07a1ac1e3cfe1292a4d3f3c79fb9d4cd1 (patch) | |
| tree | 028d172c7dd41ca2a61b78feaeafe011e4b433c8 /www | |
| parent | 2dbcc2e51ab7f5a116b86be7ef8c6e82e3cb0ce2 (diff) | |
| download | freebsd-ports-gnome-a968aaf07a1ac1e3cfe1292a4d3f3c79fb9d4cd1.tar.gz freebsd-ports-gnome-a968aaf07a1ac1e3cfe1292a4d3f3c79fb9d4cd1.tar.zst freebsd-ports-gnome-a968aaf07a1ac1e3cfe1292a4d3f3c79fb9d4cd1.zip | |
Don't check value for WITH_/WITHOUT_ vars, especially for "yes"
Just relay on they are set.
PR: 127464
Diffstat (limited to 'www')
| -rw-r--r-- | www/apache13/Makefile | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/www/apache13/Makefile b/www/apache13/Makefile index f781e529632b..6b341708d230 100644 --- a/www/apache13/Makefile +++ b/www/apache13/Makefile @@ -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 |