Fix NO_SENDMAIL knob. When FreeBSD's old BSD version of vacation was

replaced with the new version in sendmail's distribution, vacation and
the necessary libraries (libsmdb and libsmutil) were changed so they
were always compiled.  This broke people who didn't checkout
src/contrib/sendmail/.  I don't know if it's best to think of NO_SENDMAIL
as no sendmail sources available or no sendmail binary.  It is now the former.

Also, remove the sendmail chapter from System Managers Manual (SMM) if
NO_SENDMAIL is defined (for similar reasons -- source not available).

PR:		31863, 31865
Submitted by:	matusita, Joe Kelsey <joe@zircon.seattle.wa.us>
MFC after:	3 days
This commit is contained in:
Gregory Neil Shapiro 2001-11-11 05:26:59 +00:00
parent 7b9cc19934
commit 6dbfffa308
3 changed files with 15 additions and 3 deletions

View File

@ -27,7 +27,7 @@ SUBDIR= ${_csu} libcom_err libcrypt libkvm msun libmd \
libedit libfetch libform libftpio ${_libgnumalloc} ${_libio} libipsec \ libedit libfetch libform libftpio ${_libgnumalloc} ${_libio} libipsec \
libipx libisc libmenu ${_libmp} ${_libncp} \ libipx libisc libmenu ${_libmp} ${_libncp} \
libnetgraph libopie libpam libpanel libpcap \ libnetgraph libopie libpam libpanel libpcap \
${_libresolv} libsmdb libsmutil \ ${_libresolv} ${_libsmdb} ${_libsmutil} \
libstand ${_libtelnet} libusb ${_libvgl} libwrap libxpg4 liby libz libstand ${_libtelnet} libusb ${_libvgl} libwrap libxpg4 liby libz
.if exists(${.CURDIR}/csu/${MACHINE_ARCH}-${OBJFORMAT}) .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-${OBJFORMAT})
@ -51,6 +51,11 @@ _libc_r= libc_r
_libbind= libbind _libbind= libbind
.endif .endif
.if !defined(NO_SENDMAIL)
_libsmdb= libsmdb
_libsmutil= libsmutil
.endif
.if ${MACHINE_ARCH} == "i386" .if ${MACHINE_ARCH} == "i386"
_compat= compat _compat= compat
_libncp= libncp _libncp= libncp

View File

@ -12,7 +12,11 @@
# 07.lpd # 07.lpd
SUBDIR= title contents 01.setup 02.config 03.fsck 04.quotas 05.fastfs \ SUBDIR= title contents 01.setup 02.config 03.fsck 04.quotas 05.fastfs \
06.nfs 08.sendmailop 10.named 11.timedop \ 06.nfs 10.named 11.timedop \
12.timed 18.net 12.timed 18.net
.if !defined(NO_SENDMAIL)
SUBDIR+=08.sendmailop
.endif
.include <bsd.subdir.mk> .include <bsd.subdir.mk>

View File

@ -168,7 +168,6 @@ SUBDIR= apply \
users \ users \
uudecode \ uudecode \
uuencode \ uuencode \
vacation \
vgrind \ vgrind \
vi \ vi \
vis \ vis \
@ -207,6 +206,10 @@ SUBDIR+=dig \
host host
.endif .endif
.if !defined(NO_SENDMAIL)
SUBDIR+=vacation
.endif
.if ${MACHINE_ARCH} == "i386" .if ${MACHINE_ARCH} == "i386"
# Things that don't compile on alpha or are aout specific: # Things that don't compile on alpha or are aout specific:
SUBDIR+=ar \ SUBDIR+=ar \