diff options
| author | Peter Wemm <peter@FreeBSD.org> | 2000-07-14 09:18:21 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 2000-07-14 09:18:21 +0000 |
| commit | 97e8e70bd184d3ae0dca4e91cc166062b29f002e (patch) | |
| tree | 2708ca0a20b506c1ccf715d359755104d873c74a /secure/lib/libcrypto | |
| parent | 51525cb0209d650ec6d5b1ec8662aa812bdbb2c6 (diff) | |
| download | src-97e8e70bd184d3ae0dca4e91cc166062b29f002e.tar.gz src-97e8e70bd184d3ae0dca4e91cc166062b29f002e.zip | |
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>
Notes
Notes:
svn path=/head/; revision=63123
Diffstat (limited to 'secure/lib/libcrypto')
| -rw-r--r-- | secure/lib/libcrypto/Makefile | 6 | ||||
| -rw-r--r-- | secure/lib/libcrypto/Makefile.inc | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile index 55cdfb0fa3bb..870827a4a102 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 319d8098ea65..5df109004b8b 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 |