summaryrefslogtreecommitdiffstats
path: root/secure
diff options
context:
space:
mode:
authorgreen <green@FreeBSD.org>2000-08-04 04:25:59 +0000
committergreen <green@FreeBSD.org>2000-08-04 04:25:59 +0000
commit11f08cadc6694232ab54cde44f975354c62332a9 (patch)
tree0c3e8ab7aaa5e58f57c7d61f9331d488e0f81cf6 /secure
parent3da04b80dabe07351cb6872a8cfaf3236b7fcd4d (diff)
downloadFreeBSD-src-11f08cadc6694232ab54cde44f975354c62332a9.zip
FreeBSD-src-11f08cadc6694232ab54cde44f975354c62332a9.tar.gz
Unbreak the OpenSSL headers for those of us who don't/can't use IDEA by
getting rid of the check for NO_IDEA (in evp.h) completely if it's installed without MAKE_IDEA=YES.
Diffstat (limited to 'secure')
-rw-r--r--secure/lib/libcrypto/Makefile11
1 files changed, 10 insertions, 1 deletions
diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile
index 870827a..67b8128 100644
--- a/secure/lib/libcrypto/Makefile
+++ b/secure/lib/libcrypto/Makefile
@@ -178,7 +178,7 @@ SRCS+= v3_akey.c v3_alt.c v3_bcons.c v3_bitst.c v3_conf.c v3_cpols.c \
HDRS= asn1/asn1.h asn1/asn1_mac.h bio/bio.h bf/blowfish.h bn/bn.h \
buffer/buffer.h cast/cast.h comp/comp.h conf/conf.h crypto.h \
des/des.h dh/dh.h dsa/dsa.h ../e_os.h ../e_os2.h ebcdic.h \
- err/err.h evp/evp.h hmac/hmac.h lhash/lhash.h md2/md2.h \
+ err/err.h hmac/hmac.h lhash/lhash.h md2/md2.h \
md5/md5.h mdc2/mdc2.h objects/objects.h opensslv.h pem/pem.h \
pem/pem2.h pkcs12/pkcs12.h pkcs7/pkcs7.h rand/rand.h rc2/rc2.h \
rc4/rc4.h rc5/rc5.h ripemd/ripemd.h rsa/rsa.h stack/safestack.h \
@@ -272,6 +272,15 @@ beforeinstall: openssl/opensslconf.h
${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
${CRYPTO_HDRS} openssl/opensslconf.h \
${DESTDIR}/usr/include/openssl
+.if !defined(MAKE_IDEA) || ${MAKE_IDEA} != YES
+ sed '/^#ifndef NO_IDEA$$/,/^#endif$$/d' ${LCRYPTO_SRC}/evp/evp.h > \
+ ${.OBJDIR}/evp.h.new
+ ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
+ ${.OBJDIR}/evp.h.new ${DESTDIR}/usr/include/openssl/evp.h
+.else
+ ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
+ ${LCRYPTO_SRC}/evp/evp.h ${DESTDIR}/usr/include/openssl/evp.h
+.endif
.include <bsd.lib.mk>
OpenPOWER on IntegriCloud