svn commit: r312272 - stable/11/share/mk

[Ngie Cooper]

Author: ngie
Date: Mon Jan 16 07:15:14 2017
New Revision: 312272
URL: https://svnweb.freebsd.org/changeset/base/312272

Log:
  MFC r311133:
  
  Move the "MK_* options..." section before the "... MK_*_SUPPORT..." section
  
  For the case that someone set WITHOUT_GSSAPI=, now WITHOUT_KERBEROS_SUPPORT
  will be properly set.
  
  This will likely fix the issue for the default case noted in the PR I filed
  back in 2011. I am trying to fix the less obvious case documented in the PR
  still.
  
  PR:		159745

Modified:
  stable/11/share/mk/src.opts.mk
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/share/mk/src.opts.mk
==============================================================================
--- stable/11/share/mk/src.opts.mk	Mon Jan 16 07:11:47 2017	(r312271)
+++ stable/11/share/mk/src.opts.mk	Mon Jan 16 07:15:14 2017	(r312272)
@@ -375,6 +375,21 @@ MK_CLANG_FULL:= no
 .endif
 
 #
+# MK_* options whose default value depends on another option.
+#
+.for vv in \
+    GSSAPI/KERBEROS \
+    MAN_UTILS/MAN
+.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
+
+#
 # Set defaults for the MK_*_SUPPORT variables.
 #
 
@@ -401,21 +416,6 @@ MK_${var}_SUPPORT:= yes
 .endif
 .endfor
 
-#
-# MK_* options whose default value depends on another option.
-#
-.for vv in \
-    GSSAPI/KERBEROS \
-    MAN_UTILS/MAN
-.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
-
 .if !${COMPILER_FEATURES:Mc++11}
 MK_LLDB:=	no
 .endif