From 42a75d55f1b1a84c4f964635e94596da292da44d Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Fri, 25 Feb 2000 14:15:31 +0000
Subject: [PATCH] Merge from internat.freebsd.org; deal with -DRSAref the same
 way as libcrypto - not that it means much on the US code tree.

---
 secure/usr.bin/openssl/Makefile | 16 +++++++++-------
 1 file 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,19 +8,21 @@ 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 \
 	dsa.c dsaparam.c enc.c errstr.c gendh.c gendsa.c genrsa.c \