diff -urN amavisd-snapshot-20020300.org/configure.in amavisd-snapshot-20020300/configure.in
---- amavisd-snapshot-20020300.org/configure.in Thu Jun 6 22:33:49 2002
-+++ amavisd-snapshot-20020300/configure.in Thu Jun 6 22:37:15 2002
-@@ -163,10 +163,7 @@
- if test "x$qmailinject" != "x/bin/false"; then
- AC_ARG_ENABLE(qmail,
- [ --enable-qmail use qmail as MTA],
+--- 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
-
-@@ -228,7 +225,6 @@
- else
- AMAVISC=
- AMAVIS_MILTER=amavis-milter
-- MTA=libmilter
- config_type="sendmail/milter"
- fi
-
-@@ -237,34 +233,6 @@
- AC_SUBST(AMAVISC)
- AC_SUBST(AMAVIS_MILTER)
-
--AC_ARG_ENABLE(postfix,
-- [ --enable-postfix use postfix as MTA],
-- if test "x$enableval" = "xyes" ; then
-- MTA=postfix
-- fi)
+- 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
-if test "x$MTA" = "xsendmail" ; then
- strings ${sendmail_wrapper} | grep -i postfix >/dev/null 2>&1
- fi
-fi
-
--AC_ARG_ENABLE(exim,
-- [ --enable-exim use exim as MTA],
-- if test "x$enableval" = "xyes" ; then
-- MTA=exim
-- fi)
--
+ AC_ARG_ENABLE(exim,
+ [ --enable-exim use exim as MTA],
+ if test "x$enableval" = "xyes" ; then
+ MTA=exim
+ fi)
+
-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