From f534c1ac32e2f53bb2abf090451be458ee261444 Mon Sep 17 00:00:00 2001 From: "Philip M. Gollucci" Date: Fri, 7 May 2010 23:57:57 +0000 Subject: - Back out the OPTIONS framework for now. Makefile.modules MODULES options also be in OPTIONS or they aren't passed to make. Thats one huge subtlety. I'll fix this later, but don't have time now. Reported by: kevin brintnall via e-mail Pointy hat: myself With Hat: apache@ --- www/apache20/Makefile | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'www/apache20') diff --git a/www/apache20/Makefile b/www/apache20/Makefile index 9cb6c518c158..0fc06a812d6c 100644 --- a/www/apache20/Makefile +++ b/www/apache20/Makefile @@ -36,16 +36,18 @@ CONFLICTS= apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-1.* caudium-devel-1.* caudium10-1.* caudium12-1.* caudium14-1.* \ ru-apache+mod_ssl-1.* ru-apache-1.* -OPTIONS= \ - IPV6 "Enable IPv6 support" On \ - BDB "Enable BerkeleyDB dbm" Off \ - KQUEUE_SUPPORT "Enable kqueue in bundled apr" Off \ - SSL "Enable SSL support" On \ - SSL_EXPERIMENTAL_ENGINE "Use Experimental SSL engine" Off \ - DEBUG "Enable debugging" Off \ - EXCEPTION_HOOK "Enable Exception Hook" On \ - LDAP "Enable LDAP Support" Off \ - THREADS "Enable threads in apr" Off +## XXX: Every possible option for things in Makefile.modules needs to be +## XXX: in OPTIONS too, or its not passed to make. +#OPTIONS= \ +# IPV6 "Enable IPv6 support" On \ +# BDB "Enable BerkeleyDB dbm" Off \ +# KQUEUE_SUPPORT "Enable kqueue in bundled apr" Off \ +# SSL "Enable SSL support" On \ +# SSL_EXPERIMENTAL_ENGINE "Use Experimental SSL engine" Off \ +# DEBUG "Enable debugging" Off \ +# EXCEPTION_HOOK "Enable Exception Hook" On \ +# LDAP "Enable LDAP Support" Off \ +# THREADS "Enable threads in apr" Off .if defined(WITH_KQUEUE_SUPPORT) EXTRA_PATCHES+= ${FILESDIR}/exp-apr-kqueue.patch -- cgit v1.2.3