diff options
| author | tron <tron@pkgsrc.org> | 2010-05-24 16:25:29 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2010-05-24 16:25:29 +0000 |
| commit | d87a752aca6eceb7625f4ef2a14b18d18555c669 (patch) | |
| tree | d83087d3d4a952fabfe0206c57c0133774e649a7 /www/squid | |
| parent | 72e1d0cc94e74b2a2689d604c2394110ef49443f (diff) | |
| download | pkgsrc-d87a752aca6eceb7625f4ef2a14b18d18555c669.tar.gz | |
Specifically disable helpers if the according "SQUID_EXTERNAL_*_HELPERS"
variable is set to the empty string. We will otherwise end up building
all the helpers which is probably not what the user wanted.
This addresses the second halfof PR pkg/43347 by Bernd Ernesti.
Diffstat (limited to 'www/squid')
| -rw-r--r-- | www/squid/options.mk | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/www/squid/options.mk b/www/squid/options.mk index 629d5179878..03f4587b5cd 100644 --- a/www/squid/options.mk +++ b/www/squid/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.16 2010/02/19 17:22:13 tron Exp $ +# $NetBSD: options.mk,v 1.17 2010/05/24 16:25:29 tron Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.squid PKG_SUPPORTED_OPTIONS= snmp ssl \ @@ -149,28 +149,36 @@ CONFIGURE_ARGS+= --disable-unlinkd PLIST.unlinkd= yes .endif -.if !empty(SQUID_BASIC_AUTH_HELPERS) +.if empty(SQUID_BASIC_AUTH_HELPERS) +CONFIGURE_ARGS+= --enable-basic-auth-helpers=no +.else CONFIGURE_ARGS+= --enable-basic-auth-helpers=${SQUID_BASIC_AUTH_HELPERS:Q} .for i in ${SQUID_BASIC_AUTH_HELPERS} PLIST.ba_${i}= yes .endfor .endif -.if !empty(SQUID_DIGEST_AUTH_HELPERS) +.if empty(SQUID_DIGEST_AUTH_HELPERS) +CONFIGURE_ARGS+= --enable-digest-auth-helpers=no +.else CONFIGURE_ARGS+= --enable-digest-auth-helpers=${SQUID_DIGEST_AUTH_HELPERS:Q} .for i in ${SQUID_DIGEST_AUTH_HELPERS} PLIST.da_${i}= yes .endfor .endif -.if !empty(SQUID_NTLM_AUTH_HELPERS) +.if empty(SQUID_NTLM_AUTH_HELPERS) +CONFIGURE_ARGS+= --enable-ntlm-auth-helpers=no +.else CONFIGURE_ARGS+= --enable-ntlm-auth-helpers=${SQUID_NTLM_AUTH_HELPERS:Q} .for i in ${SQUID_NTLM_AUTH_HELPERS} PLIST.na_${i}= yes .endfor .endif -.if !empty(SQUID_EXTERNAL_ACL_HELPERS) +.if empty(SQUID_EXTERNAL_ACL_HELPERS) +CONFIGURE_ARGS+= --enable-external-acl-helpers=no +.else CONFIGURE_ARGS+= --enable-external-acl-helpers=${SQUID_EXTERNAL_ACL_HELPERS:Q} .for i in ${SQUID_EXTERNAL_ACL_HELPERS} PLIST.eacl_${i}= yes |