diff options
| -rw-r--r-- | secure/Makefile.inc | 2 | ||||
| -rw-r--r-- | secure/lib/libcrypto/Makefile | 6 | ||||
| -rw-r--r-- | secure/lib/libcrypto/Makefile.inc | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/secure/Makefile.inc b/secure/Makefile.inc index 658101a..4d43279 100644 --- a/secure/Makefile.inc +++ b/secure/Makefile.inc @@ -8,7 +8,7 @@ CRYPTOBJDIR= ${.CURDIR}/../../lib/libcrypt/obj CRYPTOBJDIR= ${.CURDIR}/../../lib/libcrypt .endif -.if !defined(MAKE_IDEA) || ${MAKE_IDEA} != YES +.if !defined(MAKE_IDEA) CFLAGS+= -DNO_IDEA .endif diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile index 60c8c2f..81ac3c3 100644 --- a/secure/lib/libcrypto/Makefile +++ b/secure/lib/libcrypto/Makefile @@ -160,7 +160,7 @@ SRCS+= hmac.c INCS+= hmac.h # idea -.if defined(MAKE_IDEA) && ${MAKE_IDEA} == YES +.if defined(MAKE_IDEA) SRCS+= i_cbc.c i_cfb64.c i_ecb.c i_ofb64.c i_skey.c INCS+= idea.h .endif @@ -309,7 +309,7 @@ opensslconf.h: opensslconf-${MACHINE_ARCH}.h cp ${.ALLSRC} ${.TARGET} evp.h: ${LCRYPTO_SRC}/crypto/evp/evp.h -.if !defined(MAKE_IDEA) || ${MAKE_IDEA} != YES +.if !defined(MAKE_IDEA) sed '/^#ifndef OPENSSL_NO_IDEA$$/,/^#endif$$/d' ${.ALLSRC} > ${.TARGET} .else cp ${.ALLSRC} ${.TARGET} @@ -333,7 +333,7 @@ afterinstall: _bn_asmpath= ${LCRYPTO_SRC}/crypto/bn/asm .endif -.if defined(MAKE_IDEA) && ${MAKE_IDEA} == YES +.if defined(MAKE_IDEA) _ideapath= ${LCRYPTO_SRC}/crypto/idea .endif diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc index 939449c..d6e9cc5 100644 --- a/secure/lib/libcrypto/Makefile.inc +++ b/secure/lib/libcrypto/Makefile.inc @@ -7,7 +7,7 @@ CFLAGS+= -DTERMIOS -DANSI_SOURCE CFLAGS+= -I${LCRYPTO_SRC} -I${LCRYPTO_SRC}/crypto -I${.OBJDIR} CFLAGS+= -DOPENSSL_THREADS -.if !defined(MAKE_IDEA) || ${MAKE_IDEA} != YES +.if !defined(MAKE_IDEA) CFLAGS+= -DOPENSSL_NO_IDEA .endif |
