hack around System V M4 definitions of $*, $@, etc.; also, $N

is interpolated in arguments even if the args are quoted.

SCCS-vsn: usr.sbin/sendmail/cf/m4/cf.m4 2.2

diff --git a/usr/src/usr.sbin/sendmail/cf/m4/cf.m4 b/usr/src/usr.sbin/sendmail/cf/m4/cf.m4
index 524744a..b32ae29 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.1 (Berkeley) %G%
+#      @(#)cf.m4       2.2 (Berkeley) %G%

 #
 
 
 #
 
 


@@ -38,7 +38,8 @@ define(`VERSIONID', ``#####'  $1  #####')
 m4wrap(`include(../m4/proto.m4)')
 define(`LOCAL_RULE_3', `divert(2)')
 define(`LOCAL_RULE_0', `divert(3)')
 m4wrap(`include(../m4/proto.m4)')
 define(`LOCAL_RULE_3', `divert(2)')
 define(`LOCAL_RULE_0', `divert(3)')

-define(`UUCPSMTP', ``R$* < @' $1 `.UUCP > $*   $1 < @' $2 `< $3'')
+define(`UUCPSMTP', `R DOL(*) < @' $1 `.UUCP > DOL(*)   DOL(1) < @ $2 > DOL(3)')

 define(`CONCAT', `$1$2$3$4$5$6$7')
 define(`CONCAT', `$1$2$3$4$5$6$7')

+define(`DOL', ``$'$1')

 
 divert(0)dnl
 
 divert(0)dnl