Be consistant about WITH_ vs MAKE_ flags. We have a precedent of using

MAKE_foo for things like MAKE_KERBEROS etc.  Use that.  I managed to
confuse myself last time and made make.conf different to the code. ;-(

Reported by:  Jun Kuriyama <kuriyama@FreeBSD.org>

4 files changed, 8 insertions, 8 deletions

diff --git a/etc/defaults/make.conf b/etc/defaults/make.conf
index 17d7b1d..5c5c1f0 100644
--- a/etc/defaults/make.conf
+++ b/etc/defaults/make.conf
@@ -86,11 +86,11 @@ BDECFLAGS=	-W -Wall -ansi -pedantic -Wbad-function-cast -Wcast-align \
 #
 # Patented in the USA and many european countries - thought to be OK to
 # use for any non-commercial use.  This is optional.
-#WITH_IDEA=	YES	# IDEA (128 bit symmetric encryption)
+#MAKE_IDEA=	YES	# IDEA (128 bit symmetric encryption)
 #
 # Patented in the USA only (due to expire in September 2000).  RSA is
 # required for OpenSSH.  Either use this or ports/security/rsaref.
-#WITH_RSAINTL=	YES	# RSA (public key exchange)
+#MAKE_RSAINTL=	YES	# RSA (public key exchange)
 #
 #
 # To avoid running MAKEDEV all on /dev during install:
diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile
index 55cdfb0..870827a 100644
--- a/secure/lib/libcrypto/Makefile
+++ b/secure/lib/libcrypto/Makefile
@@ -15,7 +15,7 @@
 	${LCRYPTO_SRC}/sha ${LCRYPTO_SRC}/stack ${LCRYPTO_SRC}/txt_db \
 	${LCRYPTO_SRC}/x509 ${LCRYPTO_SRC}/x509v3
 
-.if defined(WITH_IDEA) && ${WITH_IDEA} == YES
+.if defined(MAKE_IDEA) && ${MAKE_IDEA} == YES
 .PATH:  ${LCRYPTO_SRC}/idea
 .endif
 
@@ -103,7 +103,7 @@ SRCS+=	bio_b64.c bio_enc.c bio_md.c bio_ok.c c_all.c c_allc.c c_alld.c \
 SRCS+=	hmac.c
 
 # idea
-.if defined(WITH_IDEA) && ${WITH_IDEA} == YES
+.if defined(MAKE_IDEA) && ${MAKE_IDEA} == YES
 SRCS+=	i_ecb.c i_cbc.c i_cfb64.c i_ofb64.c i_skey.c
 .endif
 
@@ -185,7 +185,7 @@ HDRS=	asn1/asn1.h asn1/asn1_mac.h bio/bio.h bf/blowfish.h bn/bn.h \
 	sha/sha.h stack/stack.h tmdiff.h txt_db/txt_db.h x509/x509.h \
 	x509/x509_vfy.h x509v3/x509v3.h
 
-.if defined(WITH_IDEA) && ${WITH_IDEA} == YES
+.if defined(MAKE_IDEA) && ${MAKE_IDEA} == YES
 HDRS+=	idea/idea.h
 .endif
 
diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc
index 319d809..5df1090 100644
--- a/secure/lib/libcrypto/Makefile.inc
+++ b/secure/lib/libcrypto/Makefile.inc
@@ -2,7 +2,7 @@
 
 LCRYPTO_SRC=	${.CURDIR}/../../../crypto/openssl/crypto
 CFLAGS+= -DTERMIOS -DANSI_SOURCE -I${LCRYPTO_SRC} -I${.OBJDIR}
-.if !defined(WITH_IDEA) || ${WITH_IDEA} != YES
+.if !defined(MAKE_IDEA) || ${MAKE_IDEA} != YES
 CFLAGS+= -DNO_IDEA
 .endif
 
diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf
index 17d7b1d..5c5c1f0 100644
--- a/share/examples/etc/make.conf
+++ b/share/examples/etc/make.conf
@@ -86,11 +86,11 @@ BDECFLAGS=	-W -Wall -ansi -pedantic -Wbad-function-cast -Wcast-align \
 #
 # Patented in the USA and many european countries - thought to be OK to
 # use for any non-commercial use.  This is optional.
-#WITH_IDEA=	YES	# IDEA (128 bit symmetric encryption)
+#MAKE_IDEA=	YES	# IDEA (128 bit symmetric encryption)
 #
 # Patented in the USA only (due to expire in September 2000).  RSA is
 # required for OpenSSH.  Either use this or ports/security/rsaref.
-#WITH_RSAINTL=	YES	# RSA (public key exchange)
+#MAKE_RSAINTL=	YES	# RSA (public key exchange)
 #
 #
 # To avoid running MAKEDEV all on /dev during install: