diff options
| author | Peter Wemm <peter@FreeBSD.org> | 2000-02-25 14:15:31 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 2000-02-25 14:15:31 +0000 |
| commit | 42a75d55f1b1a84c4f964635e94596da292da44d (patch) | |
| tree | 678596a9b88411e396b5c6da818fdc04df0ab398 /secure/usr.bin | |
| parent | cfd62b902ea3a3ccbfb240043459a032c26185fa (diff) | |
| download | src-42a75d55f1b1a84c4f964635e94596da292da44d.tar.gz src-42a75d55f1b1a84c4f964635e94596da292da44d.zip | |
Merge from internat.freebsd.org; deal with -DRSAref the same way as
libcrypto - not that it means much on the US code tree.
Notes
Notes:
svn path=/head/; revision=57485
Diffstat (limited to 'secure/usr.bin')
| -rw-r--r-- | secure/usr.bin/openssl/Makefile | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/secure/usr.bin/openssl/Makefile b/secure/usr.bin/openssl/Makefile index fe633b30d84a..697faf1e4272 100644 --- a/secure/usr.bin/openssl/Makefile +++ b/secure/usr.bin/openssl/Makefile @@ -8,18 +8,20 @@ LDADD= -lssl -lcrypto NOMAN= noman OPENSSL_SRC= ${.CURDIR}/../../../crypto/openssl/apps +LCRYPTO_SRC= ${.CURDIR}/../../../crypto/openssl/crypto CFLAGS+= -DMONOLITH -DNO_IDEA -I${.CURDIR} -LOCALBASE?= /usr/local - -.if !defined(USA_RESIDENT) || ${USA_RESIDENT} != NO -.if !exists(${LOCALBASE}/lib/librsaref.a) -CFLAGS+= -DNO_RSA -DNO_SSL2 +WITH_RSA?= YES +.if ${WITH_RSA} == NO +CFLAGS+= -DNO_RSA -DNO_SSL2 .else -CFLAGS+= -DRSAref -LDADD+= ${LOCALBASE}/lib/librsaref.a +.if !defined(USA_RESIDENT) || ${USA_RESIDENT} != NO +RSAREF= YES +.endif .endif +.if (defined(RSAREF) && ${RSAREF} == YES) || !exists(${LCRYPTO_SRC}/rsa/rsa_eay.c) +CFLAGS+= -DRSAref .endif SRCS= apps.c asn1pars.c ca.c ciphers.c crl.c crl2p7.c dgst.c dh.c \ |