New make knob, SENDMAIL_M4_FLAGS, modifies the flags passed to m4 when

building a .cf file from a .mc file.

Include -D_FFR_TLS_O_T to enable tls policy control since the sendmail binary
build enables that FFR as well.

PR:		conf/28361
MFC after:	1 week
This commit is contained in:
Gregory Neil Shapiro 2001-07-23 01:33:54 +00:00
parent 79c96a6ccd
commit f4843be999
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=80175
5 changed files with 23 additions and 3 deletions

View File

@ -367,6 +367,12 @@ BDECFLAGS= -W -Wall -ansi -pedantic -Wbad-function-cast -Wcast-align \
# #
#SENDMAIL_ADDITIONAL_MC=/etc/mail/foo.mc /etc/mail/bar.mc #SENDMAIL_ADDITIONAL_MC=/etc/mail/foo.mc /etc/mail/bar.mc
# #
# Setting the following variable modifies the flags passed to m4 when
# building a .cf file from a .mc file. It can be used to enable
# features disabled by default.
#
#SENDMAIL_M4_FLAGS=
#
# Setting the following variables modifies the build environment for # Setting the following variables modifies the build environment for
# sendmail and its related utilities. For example, SASL support can be # sendmail and its related utilities. For example, SASL support can be
# added with settings such as: # added with settings such as:

View File

@ -39,6 +39,8 @@
# uucpdomain, virtusertable # uucpdomain, virtusertable
# #
SENDMAIL_M4_FLAGS+= -D_FFR_TLS_O_T
.ifndef SENDMAIL_MC .ifndef SENDMAIL_MC
SENDMAIL_MC!= hostname SENDMAIL_MC!= hostname
SENDMAIL_MC:= ${SENDMAIL_MC}.mc SENDMAIL_MC:= ${SENDMAIL_MC}.mc
@ -124,8 +126,8 @@ M4FILES!= find ${SENDMAIL_CF_DIR} -type f -name '*.m4' -print
.SUFFIXES: .cf .mc .SUFFIXES: .cf .mc
.mc.cf: ${M4FILES} .mc.cf: ${M4FILES}
${M4} -D_CF_DIR_=${SENDMAIL_CF_DIR}/ ${SENDMAIL_CF_DIR}/m4/cf.m4 \ ${M4} -D_CF_DIR_=${SENDMAIL_CF_DIR}/ ${SENDMAIL_M4_FLAGS} \
${@:R}.mc > ${.TARGET} ${SENDMAIL_CF_DIR}/m4/cf.m4 ${@:R}.mc > ${.TARGET}
# #
# Aliases are handled separately since they normally reside in /etc # Aliases are handled separately since they normally reside in /etc

View File

@ -10,6 +10,8 @@ SENDMAIL_DIR= ${.CURDIR}/../../contrib/sendmail
SMDIR= ${SENDMAIL_DIR}/src SMDIR= ${SENDMAIL_DIR}/src
CFDIR= ${SENDMAIL_DIR}/cf CFDIR= ${SENDMAIL_DIR}/cf
SENDMAIL_M4_FLAGS+= -D_FFR_TLS_O_T
# this is overkill, but.... # this is overkill, but....
M4FILES!= find ${CFDIR} -type f -name '*.m4' -print M4FILES!= find ${CFDIR} -type f -name '*.m4' -print
@ -18,7 +20,8 @@ M4FILES!= find ${CFDIR} -type f -name '*.m4' -print
.mc.cf: ${M4FILES} .mc.cf: ${M4FILES}
${RM} ${.TARGET} ${RM} ${.TARGET}
(cd ${.CURDIR} && \ (cd ${.CURDIR} && \
${M4} -D_CF_DIR_=${CFDIR}/ ${CFDIR}/m4/cf.m4 ${@:R}.mc) > ${.TARGET} ${M4} -D_CF_DIR_=${CFDIR}/ ${SENDMAIL_M4_FLAGS} \
${CFDIR}/m4/cf.m4 ${@:R}.mc) > ${.TARGET}
${CHMOD} ${ROMODE} ${.TARGET} ${CHMOD} ${ROMODE} ${.TARGET}
ALL= freebsd.cf ALL= freebsd.cf

View File

@ -367,6 +367,12 @@ BDECFLAGS= -W -Wall -ansi -pedantic -Wbad-function-cast -Wcast-align \
# #
#SENDMAIL_ADDITIONAL_MC=/etc/mail/foo.mc /etc/mail/bar.mc #SENDMAIL_ADDITIONAL_MC=/etc/mail/foo.mc /etc/mail/bar.mc
# #
# Setting the following variable modifies the flags passed to m4 when
# building a .cf file from a .mc file. It can be used to enable
# features disabled by default.
#
#SENDMAIL_M4_FLAGS=
#
# Setting the following variables modifies the build environment for # Setting the following variables modifies the build environment for
# sendmail and its related utilities. For example, SASL support can be # sendmail and its related utilities. For example, SASL support can be
# added with settings such as: # added with settings such as:

View File

@ -496,6 +496,9 @@ Additional .mc files which should be built into .cf files at build time.
The value should include the full path to the .mc file(s), e.g., The value should include the full path to the .mc file(s), e.g.,
.Pa /etc/mail/foo.mc .Pa /etc/mail/foo.mc
.Pa /etc/mail/bar.mc . .Pa /etc/mail/bar.mc .
.It Va SENDMAIL_M4_FLAGS
.Pq Vt str
Flags passed to m4 when building a .cf file from a .mc file.
.It Va SENDMAIL_CFLAGS .It Va SENDMAIL_CFLAGS
.Pq Vt str .Pq Vt str
Flags to pass to the compile command when building Flags to pass to the compile command when building