From fb35998cf918637e001eab3ebc4e918f7e74f437 Mon Sep 17 00:00:00 2001
From: kris <kris@FreeBSD.org>
Date: Sun, 16 Jan 2000 21:00:06 +0000
Subject: The wrong version of the file was committed previously which explains
 the problems seen here.

---
 secure/usr.bin/openssl/Makefile | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

(limited to 'secure')

diff --git a/secure/usr.bin/openssl/Makefile b/secure/usr.bin/openssl/Makefile
index 54b7fd5..e9e4d1f 100644
--- a/secure/usr.bin/openssl/Makefile
+++ b/secure/usr.bin/openssl/Makefile
@@ -11,13 +11,13 @@ OPENSSL_SRC= ${.CURDIR}/../../../crypto/openssl/apps
 
 CFLAGS+= -DMONOLITH -DNO_IDEA -I${.CURDIR}
 
-.if !defined(RSA_NONCOMMERCIAL) || ${RSA_NONCOMMERCIAL} != YES
+LOCALBASE?=	/usr/local
+
+.if !exists(${LOCALBASE}/lib/librsaref.a)
 CFLAGS+= -DNO_RSA -DNO_SSL2
-WITH_RSA= NO
 .else
 CFLAGS+= -DRSAref
-LDADD+=	-L/usr/local/lib -lrsaref
-RSAREF= YES
+LDADD+=	-L${LOCALBASE}/lib -lrsaref
 .endif
 
 SRCS=	apps.c asn1pars.c ca.c ciphers.c crl.c crl2p7.c dgst.c dh.c \
@@ -29,3 +29,16 @@ SRCS=	apps.c asn1pars.c ca.c ciphers.c crl.c crl2p7.c dgst.c dh.c \
 .PATH:	${OPENSSL_SRC}
 
 .include <bsd.prog.mk>
+
+
+
+
+
+
+
+
+
+
+
+
+
-- 
cgit v1.1