- adapterized

[packages/amavisd.git] / amavisd-notest-mta.patch

diff --git a/amavisd-notest-mta.patch b/amavisd-notest-mta.patch
index 7175a6c8405aeb347d8c18ae0c34e15c6bbcc080..0fee3159795f1ec8e3af88d0efe5a9c5a9515286 100644 (file)
--- a/amavisd-notest-mta.patch
+++ b/amavisd-notest-mta.patch
@@ -1,41 +1,49 @@
-diff -Nru amavisd-snapshot-20010714.orig/configure.in amavisd-snapshot-20010714/configure.in
---- amavisd-snapshot-20010714.orig/configure.in        Sat Jul 14 18:23:35 2001
-+++ amavisd-snapshot-20010714/configure.in     Sat Apr 20 15:05:49 2002
-@@ -217,12 +217,12 @@
+diff -urN amavisd-snapshot-20020300.org/configure.in amavisd-snapshot-20020300/configure.in
+--- amavisd-snapshot-20020300.org/configure.in Fri Jun  7 01:35:35 2002
++++ amavisd-snapshot-20020300/configure.in     Fri Jun  7 01:54:16 2002
+@@ -160,16 +160,6 @@
+ qmaildir=`dirname $qmailinject`
+ AC_SUBST(qmaildir)
+ 
+-if test "x$qmailinject" != "x/bin/false"; then
+-  AC_ARG_ENABLE(qmail,
+-    [  --enable-qmail                use qmail as MTA],
+-    if test "x$enableval" != "xno" ; then
+-      MTA=qmail
+-    fi,
+-    MTA=qmail
+-    config_type=qmail-queue)
+-fi
+-
+ #
+ if test "x$MTA" = "xqmail" ; then
+   AC_MSG_ERROR([qmail is not supported by amavisd])
+@@ -243,28 +233,12 @@
+     MTA=postfix
    fi)
  
- dnl Need to find out whether sendmail_wrapper is really postfix' sendmail
+-dnl Need to find out whether sendmail_wrapper is really postfix' sendmail
 -if test "x$MTA" = "xsendmail" ; then
 -  strings ${sendmail_wrapper} | grep -i postfix >/dev/null 2>&1
 -  if test $? -eq 0 ; then
 -    MTA=postfix
 -  fi
 -fi
-+dnl if test "x$MTA" = "xsendmail" ; then
-+dnl   strings ${sendmail_wrapper} | grep -i postfix >/dev/null 2>&1
-+dnl   if test $? -eq 0 ; then
-+dnl     MTA=postfix
-+dnl   fi
-+dnl fi
- 
+-
  AC_ARG_ENABLE(exim,
    [  --enable-exim                 use exim as MTA],
-@@ -231,12 +231,12 @@
+   if test "x$enableval" = "xyes" ; then
+     MTA=exim
    fi)
  
- dnl Need to find out whether sendmail_wrapper is really exim's sendmail
+-dnl Need to find out whether sendmail_wrapper is really exim's sendmail
 -if test "x$MTA" = "xsendmail" ; then
 -  strings ${sendmail_wrapper} | grep -i exim >/dev/null 2>&1
 -  if test $? -eq 0 ; then
 -    MTA=exim
 -  fi
 -fi
-+dnl if test "x$MTA" = "xsendmail" ; then
-+dnl   strings ${sendmail_wrapper} | grep -i exim >/dev/null 2>&1
-+dnl   if test $? -eq 0 ; then
-+dnl     MTA=exim
-+dnl   fi
-+dnl fi
- 
- dnl
- dnl only postfix and sendmail for now
+-
+ dnl only sendmail
+ dnl relay/no relay must be known before looking
+ dnl for original sendmail.cf file