From fa54144cce7ef5673a901cba6be5519d8be69002 Mon Sep 17 00:00:00 2001 From: Gregory Neil Shapiro Date: Fri, 13 Oct 2000 03:20:43 +0000 Subject: [PATCH] Given that sendmail's STARTTLS support requires OpenSSL and the bootstrap issues that brings, build the non-TLS version of sendmail in src/usr.sbin/sendmail and the TLS version in src/secure/usr.sbin/sendmail. This allows the TLS version to be part of the secure distribution when building a release. --- secure/usr.sbin/sendmail/Makefile | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/secure/usr.sbin/sendmail/Makefile b/secure/usr.sbin/sendmail/Makefile index c82cd659a64..200e00c70a6 100644 --- a/secure/usr.sbin/sendmail/Makefile +++ b/secure/usr.sbin/sendmail/Makefile @@ -1,7 +1,7 @@ # @(#)Makefile 8.8 (Berkeley) 3/28/97 # $FreeBSD$ -SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail +SENDMAIL_DIR=${.CURDIR}/../../../contrib/sendmail SMDIR= ${SENDMAIL_DIR}/src .PATH: ${SMDIR} @@ -34,16 +34,23 @@ MAN5= aliases.5 MAN8= sendmail.8 BINMODE=4555 -.if exists(${.OBJDIR}/../../lib/libsmutil) -LIBSMUTILDIR:= ${.OBJDIR}/../../lib/libsmutil +.if exists(${.OBJDIR}/../../../lib/libsmutil) +LIBSMUTILDIR:= ${.OBJDIR}/../../../lib/libsmutil .else -LIBSMUTILDIR!= cd ${.CURDIR}/../../lib/libsmutil; make -V .OBJDIR +LIBSMUTILDIR!= cd ${.CURDIR}/../../../lib/libsmutil; make -V .OBJDIR .endif LIBSMUTIL:= ${LIBSMUTILDIR}/libsmutil.a DPADD+= ${LIBSMUTIL} LDADD+= ${LIBSMUTIL} +.if !defined(NO_OPENSSL) +# STARTTLS support +CFLAGS+=-DSTARTTLS -D_FFR_TLS_O_T -D_FFR_TLS_1 -D_FFR_TLS_TOREK +LDADD+= -lssl -lcrypto +DPADD+= ${LIBSSL} ${LIBCRYPTO} +.endif + # User customizations to the sendmail build environment CFLAGS+=${SENDMAIL_CFLAGS} DPADD+=${SENDMAIL_DPADD}