put OS info back into the Makefile; sendmail discretionary info goes into

conf.h.

SCCS-mr: usr.sbin/sendmail/src/conf.h 070
SCCS-vsn: usr.sbin/sendmail/src/conf.h 3.2

diff --git a/usr/src/usr.sbin/sendmail/src/conf.h b/usr/src/usr.sbin/sendmail/src/conf.h
index 2638763..9d07ea2 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/conf.h
+++ b/usr/src/usr.sbin/sendmail/src/conf.h
@@ -1,7 +1,7 @@
 /*
 /*

-**  CONF.H -- All user-configurable parameters
+**  CONF.H -- All user-configurable parameters for sendmail

 **
 **

-**     @(#)conf.h      3.1             %G%
+**     @(#)conf.h      3.2             %G%

 */
 
 
 */
 
 


@@ -33,5 +33,3 @@
 #define QUEUE          1       /* enable queueing */
 #define UGLYUUCP       1       /* output ugly UUCP From lines */
 #define DAEMON         1       /* include the daemon (requires IPC) */
 #define QUEUE          1       /* enable queueing */
 #define UGLYUUCP       1       /* output ugly UUCP From lines */
 #define DAEMON         1       /* include the daemon (requires IPC) */

-#define VMUNIX         1       /* VMUNIX options (4.1bsd) */
-/* #define NVMUNIX     1       /* new VMUNIX options (4.2bsd, requires VMUNIX) */