Turn MAKE_IDEA into a true "bool" type variable, as documented in
the make.conf(5) manpage. PR: conf/65738 OK'ed by: markm
This commit is contained in:
parent
fdf483fd6c
commit
9a78a820cc
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user