Don't add inet6 to PKG_DEFAULT_OPTIONS, it is a user settable

variable.  mk/defaults/obsolete.mk takes care of converting USE_INET6
to inet6 option.  Bug noted by schmonz.
This commit is contained in:
dillo 2005-08-16 19:55:38 +00:00
parent 2e8a0d6f8e
commit c8597fd2b5

View file

@ -1,4 +1,4 @@
# $NetBSD: bsd.prefs.mk,v 1.199 2005/07/28 13:07:17 wiz Exp $ # $NetBSD: bsd.prefs.mk,v 1.200 2005/08/16 19:55:38 dillo Exp $
# #
# Make file, included to get the site preferences, if any. Should # Make file, included to get the site preferences, if any. Should
# only be included by package Makefiles before any .if defined() # only be included by package Makefiles before any .if defined()
@ -355,11 +355,9 @@ PKG_INSTALLATION_TYPE?= none
. if empty(USE_INET6:M[Yy][Ee][Ss]) || defined(USE_SOCKS) . if empty(USE_INET6:M[Yy][Ee][Ss]) || defined(USE_SOCKS)
USE_INET6= NO USE_INET6= NO
. else . else
PKG_DEFAULT_OPTIONS+= inet6
USE_INET6= YES USE_INET6= YES
. endif . endif
.elif empty(_OPSYS_HAS_INET6:M[nN][oO]) && !defined(USE_SOCKS) .elif empty(_OPSYS_HAS_INET6:M[nN][oO]) && !defined(USE_SOCKS)
PKG_DEFAULT_OPTIONS+= inet6
USE_INET6= YES USE_INET6= YES
.else .else
USE_INET6= NO USE_INET6= NO