diff options
author | ru <ru@FreeBSD.org> | 2007-12-12 16:39:32 +0000 |
---|---|---|
committer | ru <ru@FreeBSD.org> | 2007-12-12 16:39:32 +0000 |
commit | d5938a1c2a6280a3467c8ea87ea54e5ee358beea (patch) | |
tree | d1d138e51bf209dea7b2ab3cb7800819a015f7c0 /share | |
parent | b02556dae5c4b2e396b5bee2c663fe38f28d369b (diff) | |
download | FreeBSD-src-d5938a1c2a6280a3467c8ea87ea54e5ee358beea.zip FreeBSD-src-d5938a1c2a6280a3467c8ea87ea54e5ee358beea.tar.gz |
- Fix setting of MK_GSSAPI option by bsd.own.mk; its value should
default to the value of MK_KERBEROS unless set explicitly by
WITH_GSSAPI/WITHOUT_GSSAPI. (This introduces another type of
MK_* variables which itself is questionable.)
- Teach tools/build/options/makeman script that generates the
src.conf(5) manpage about the new type of MK_* variables.
- Fix broken logic in lib/Makefile.
Diffstat (limited to 'share')
-rw-r--r-- | share/mk/bsd.own.mk | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index d1a89f2..ab9f760 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -381,7 +381,6 @@ MK_${var}:= yes # .for var in \ BIND_LIBS \ - GSSAPI \ HESIOD \ IDEA .if defined(WITH_${var}) && defined(WITHOUT_${var}) @@ -479,6 +478,27 @@ MK_${var}_SUPPORT:= no MK_${var}_SUPPORT:= yes .endif .endfor + +# +# MK_* options whose default value depends on another option. +# +.for vv in \ + GSSAPI/KERBEROS +.if defined(WITH_${vv:H}) && defined(WITHOUT_${vv:H}) +.error WITH_${vv:H} and WITHOUT_${vv:H} can't both be set. +.endif +.if defined(MK_${vv:H}) +.error MK_${vv:H} can't be set by a user. +.endif +.if defined(WITH_${vv:H}) +MK_${vv:H}:= yes +.elif defined(WITHOUT_${vv:H}) +MK_${vv:H}:= no +.else +MK_${vv:H}:= ${MK_${vv:T}} +.endif +.endfor + .endif # !_WITHOUT_SRCCONF .endif # !target(__<bsd.own.mk>__) |