make it so it will work on systems without m4_wrap

SCCS-vsn: usr.sbin/sendmail/cf/m4/cf.m4 2.16
SCCS-vsn: usr.sbin/sendmail/cf/m4/proto.m4 2.28

diff --git a/usr/src/usr.sbin/sendmail/cf/m4/cf.m4 b/usr/src/usr.sbin/sendmail/cf/m4/cf.m4
index 1243cc3..5ee881c 100644 (file)
--- a/usr/src/usr.sbin/sendmail/cf/m4/cf.m4
+++ b/usr/src/usr.sbin/sendmail/cf/m4/cf.m4
@@ -6,7 +6,7 @@ divert(0)dnl
 #
 # %sccs.include.redist.sh%
 #
 #
 # %sccs.include.redist.sh%
 #

-#      @(#)cf.m4       2.15 (Berkeley) %G%
+#      @(#)cf.m4       2.16 (Berkeley) %G%

 #
 
 
 #
 
 


@@ -53,7 +53,8 @@ define(`SITE', `ifelse(CONCAT($'2`, $3), SU,
 sinclude(../siteconfig/$1.m4)')
 define(`LOCAL_NAME', `PUSHDIVERT(5)CL$1
 POPDIVERT`'dnl')
 sinclude(../siteconfig/$1.m4)')
 define(`LOCAL_NAME', `PUSHDIVERT(5)CL$1
 POPDIVERT`'dnl')

+define(`DOIT', `include(`../m4/proto.m4')')

 
 

-m4wrap(`include(`../m4/proto.m4')')
+m4wrap(`DOIT')

 
 divert(0)dnl
 
 divert(0)dnl

diff --git a/usr/src/usr.sbin/sendmail/cf/m4/proto.m4 b/usr/src/usr.sbin/sendmail/cf/m4/proto.m4
index e0ab5b6..e77c431 100644 (file)
--- a/usr/src/usr.sbin/sendmail/cf/m4/proto.m4
+++ b/usr/src/usr.sbin/sendmail/cf/m4/proto.m4
@@ -8,7 +8,8 @@ divert(-1)
 #
 divert(0)
 
 #
 divert(0)
 

-VERSIONID(@(#)proto.m4 2.27 (Berkeley) %G%)
+VERSIONID(@(#)proto.m4 2.28 (Berkeley) %G%)
+define(`DOIT', `dnl')dnl

 
 MAILER(local)dnl
 
 
 MAILER(local)dnl