diff options
| author | Gregory Neil Shapiro <gshapiro@FreeBSD.org> | 2003-02-08 20:35:51 +0000 |
|---|---|---|
| committer | Gregory Neil Shapiro <gshapiro@FreeBSD.org> | 2003-02-08 20:35:51 +0000 |
| commit | 2ef40764f06885f97d380ee8de0ced64930423db (patch) | |
| tree | e9e902fe45cc13b5eeb0f81f2aa041f4296bdd54 /contrib/sendmail/cf | |
| parent | 9e80f49658bb874247c840b7a5989b0a38553927 (diff) | |
Resolve conflicts from sendmail 8.12.7 import
Notes
Notes:
svn path=/head/; revision=110563
Diffstat (limited to 'contrib/sendmail/cf')
| -rw-r--r-- | contrib/sendmail/cf/m4/cfhead.m4 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/sendmail/cf/m4/cfhead.m4 b/contrib/sendmail/cf/m4/cfhead.m4 index 2f92fbd88db2..8d99968694a4 100644 --- a/contrib/sendmail/cf/m4/cfhead.m4 +++ b/contrib/sendmail/cf/m4/cfhead.m4 @@ -17,11 +17,11 @@ ##### ##### SENDMAIL CONFIGURATION FILE ##### -ifdef(`unix', `dnl +ifdef(`__win32__', `dnl', `dnl ifdef(`TEMPFILE', `dnl', `define(`TEMPFILE', maketemp(/tmp/cfXXXXXX))dnl syscmd(sh _CF_DIR_`'sh/makeinfo.sh _CF_DIR_ > TEMPFILE)dnl include(TEMPFILE)dnl -syscmd(rm -f TEMPFILE)dnl')', `dnl') +syscmd(rm -f TEMPFILE)dnl')') ##### ###################################################################### ##### @@ -305,4 +305,4 @@ define(`confMILTER_MACROS_ENVRCPT', ``{rcpt_mailer}, {rcpt_host}, {rcpt_addr}'') divert(0)dnl -VERSIONID(`$Id: cfhead.m4,v 8.108 2002/06/13 18:53:24 ca Exp $') +VERSIONID(`$Id: cfhead.m4,v 8.108.2.1 2002/08/27 20:19:08 gshapiro Exp $') |