From 6dbfffa3084b4f8cb7ab208c92e386718ec0ed9d Mon Sep 17 00:00:00 2001 From: Gregory Neil Shapiro Date: Sun, 11 Nov 2001 05:26:59 +0000 Subject: [PATCH] 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 MFC after: 3 days --- lib/Makefile | 7 ++++++- share/doc/smm/Makefile | 6 +++++- usr.bin/Makefile | 5 ++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/lib/Makefile b/lib/Makefile index 7a5172aa011..ca8ad9abd44 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -27,7 +27,7 @@ SUBDIR= ${_csu} libcom_err libcrypt libkvm msun libmd \ libedit libfetch libform libftpio ${_libgnumalloc} ${_libio} libipsec \ libipx libisc libmenu ${_libmp} ${_libncp} \ libnetgraph libopie libpam libpanel libpcap \ - ${_libresolv} libsmdb libsmutil \ + ${_libresolv} ${_libsmdb} ${_libsmutil} \ libstand ${_libtelnet} libusb ${_libvgl} libwrap libxpg4 liby libz .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-${OBJFORMAT}) @@ -51,6 +51,11 @@ _libc_r= libc_r _libbind= libbind .endif +.if !defined(NO_SENDMAIL) +_libsmdb= libsmdb +_libsmutil= libsmutil +.endif + .if ${MACHINE_ARCH} == "i386" _compat= compat _libncp= libncp diff --git a/share/doc/smm/Makefile b/share/doc/smm/Makefile index 58e708a3ce9..7f6334d9a6f 100644 --- a/share/doc/smm/Makefile +++ b/share/doc/smm/Makefile @@ -12,7 +12,11 @@ # 07.lpd 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 +.if !defined(NO_SENDMAIL) +SUBDIR+=08.sendmailop +.endif + .include diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 34d9ab1e315..7ff1f86ad97 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -168,7 +168,6 @@ SUBDIR= apply \ users \ uudecode \ uuencode \ - vacation \ vgrind \ vi \ vis \ @@ -207,6 +206,10 @@ SUBDIR+=dig \ host .endif +.if !defined(NO_SENDMAIL) +SUBDIR+=vacation +.endif + .if ${MACHINE_ARCH} == "i386" # Things that don't compile on alpha or are aout specific: SUBDIR+=ar \