summaryrefslogtreecommitdiffstats
path: root/secure
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>2000-07-14 09:18:21 +0000
committerpeter <peter@FreeBSD.org>2000-07-14 09:18:21 +0000
commitb9b09beff77fa0c63504c65b19ba867fd78e84da (patch)
tree0019e68c5bdaedaa746ca117586b046263ee0456 /secure
parent3d1a13821110880d487f70d32e7bdc79047815ac (diff)
downloadFreeBSD-src-b9b09beff77fa0c63504c65b19ba867fd78e84da.zip
FreeBSD-src-b9b09beff77fa0c63504c65b19ba867fd78e84da.tar.gz
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>
Diffstat (limited to 'secure')
-rw-r--r--secure/lib/libcrypto/Makefile6
-rw-r--r--secure/lib/libcrypto/Makefile.inc2
2 files changed, 4 insertions, 4 deletions
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
OpenPOWER on IntegriCloud