diff -r -u -N amavis.orig/amavis/Makefile.am amavis/amavis/Makefile.am
--- amavis.orig/amavis/Makefile.am	Thu Apr 19 20:39:17 2001
+++ amavis/amavis/Makefile.am	Sat Aug 25 22:31:06 2001
@@ -1,5 +1,7 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
 
+SUBDIRS = notify
+
 sbin_PROGRAMS = @AMAVISC@ @AMAVIS_MILTER@
 
 EXTRA_PROGRAMS = amavis amavis-milter
@@ -12,7 +14,7 @@
 sbin_SCRIPTS = amavisd
 sysconf_DATA = amavisd.conf
 
-EXTRA_DIST = av mta notify
+EXTRA_DIST = av mta
 
 CLEANFILES = $(noinst_SCRIPTS) $(sbin_SCRIPTS)
 
diff -r -u -N amavis.orig/amavis/amavisd.conf.in amavis/amavis/amavisd.conf.in
--- amavis.orig/amavis/amavisd.conf.in	Sun Aug 12 19:52:57 2001
+++ amavis/amavis/amavisd.conf.in	Sat Aug 25 01:33:01 2001
@@ -105,6 +105,8 @@
 #
 
 # Notify admin/sender/recipient?
+# if you wish to give a filename for the notify code fragment
+# otherwise leave it blank
 $warnadmin = "@warnadmin@";
 $warnsender = "@warnsender@";
 $warnrecip = "@warnrecip@";
diff -r -u -N amavis.orig/amavis/amavisd.in amavis/amavis/amavisd.in
--- amavis.orig/amavis/amavisd.in	Wed Aug 22 16:48:36 2001
+++ amavis/amavis/amavisd.in	Sat Aug 25 21:38:43 2001
@@ -423,15 +423,15 @@
 		}
 
 		# Then we send email
-		warn_sender() if ($warnsender eq "yes");
+		warn_sender() if ($warnsender ne "");
 
 		# warn_recip() is disabled by default because of possible
 		# problems with mailing lists. Enable only if you know what
 		# you're doing!
-		warn_recip() if ($warnrecip eq "yes");
+		warn_recip() if ($warnrecip ne "");
 
 		# Notify admin
-		warn_admin($output) if ($warnadmin eq "yes");
+		warn_admin($output) if ($warnadmin ne "");
 
 		# Finally, we bounce the message or pretend everything was okay,
 		# depending on the MTA
@@ -448,7 +448,8 @@
 	return 0 if ($SENDER eq "<>" or $entity->head->get("Precedence") =~ /bulk|list/io);
 
 	open(MAIL, "|$sendmail_wrapper $sendmail_wrapper_args -f$mailfrom") ||
-	  do_exit($REGERR, __LINE__);@warn_sender_frag@
+	  do_exit($REGERR, __LINE__);
+	  do "$warnsender" || do_exit($REGERR, __LINE__);
 	close(MAIL);
 }
 
@@ -458,7 +459,8 @@
 	my $output = shift;
 
 	open(MAIL, "|$sendmail_wrapper $sendmail_wrapper_args -f$mailfrom") ||
-	  do_exit($REGERR, __LINE__);@warn_admin_frag@
+	  do_exit($REGERR, __LINE__);
+	  do "$warnadmin" || do_exit($REGERR, __LINE__);
 	close(MAIL);
 }
 
@@ -478,7 +480,8 @@
 
 		if ($rcpt_is_local || $warn_offsite eq "yes") {
 			open(MAIL, "|$sendmail_wrapper $sendmail_wrapper_args -f$mailfrom") ||
-			  do_exit($REGERR, __LINE__);@warn_recip_frag@
+			  do_exit($REGERR, __LINE__);
+			  do "$warnrecip" || do_exit($REGERR, __LINE__);
 			close(MAIL);
 		}
 	}
diff -r -u -N amavis.orig/amavis/notify/Makefile.am amavis/amavis/notify/Makefile.am
--- amavis.orig/amavis/notify/Makefile.am	Thu Jan  1 01:00:00 1970
+++ amavis/amavis/notify/Makefile.am	Sat Aug 25 22:55:28 2001
@@ -0,0 +1,4 @@
+## Process this file with automake to produce Makefile.in -*-Makefile-*-
+
+pkgdata_DATA = admin recip sender
+
diff -r -u -N amavis.orig/amavis/notify/Makefile.in amavis/amavis/notify/Makefile.in
--- amavis.orig/amavis/notify/Makefile.in	Thu Jan  1 01:00:00 1970
+++ amavis/amavis/notify/Makefile.in	Sat Aug 25 23:21:36 2001
@@ -0,0 +1,258 @@
+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+DESTDIR =
+
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
+top_builddir = ../..
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+transform = @program_transform_name@
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
+AMAVISC = @AMAVISC@
+AMAVIS_MILTER = @AMAVIS_MILTER@
+CC = @CC@
+MAKEINFO = @MAKEINFO@
+MTA = @MTA@
+PACKAGE = @PACKAGE@
+PKG_COMPILE_DATE = @PKG_COMPILE_DATE@
+PKG_EMAIL = @PKG_EMAIL@
+PKG_HOME_URL = @PKG_HOME_URL@
+PKG_REL_DATE = @PKG_REL_DATE@
+PTHREAD_CC = @PTHREAD_CC@
+PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+PTHREAD_LIBS = @PTHREAD_LIBS@
+VERSION = @VERSION@
+amavisuser = @amavisuser@
+antivir = @antivir@
+arc = @arc@
+avp = @avp@
+avpd = @avpd@
+avpdc = @avpdc@
+avscanner = @avscanner@
+bunzip2 = @bunzip2@
+config_dir = @config_dir@
+csav = @csav@
+do_syslog = @do_syslog@
+enable_relay = @enable_relay@
+file = @file@
+fprot = @fprot@
+fsav = @fsav@
+id = @id@
+inocucmd = @inocucmd@
+lha = @lha@
+logdir = @logdir@
+nod32 = @nod32@
+perl = @perl@
+procmail = @procmail@
+qmaildir = @qmaildir@
+qmailinject = @qmailinject@
+rav = @rav@
+runtime_dir = @runtime_dir@
+sendmail_cf_orig = @sendmail_cf_orig@
+sendmail_wrapper = @sendmail_wrapper@
+sendmail_wrapper_args = @sendmail_wrapper_args@
+smtp_port = @smtp_port@
+sockname = @sockname@
+sophie = @sophie@
+sophie_sockname = @sophie_sockname@
+sophos = @sophos@
+sophos_ide = @sophos_ide@
+syslog_level = @syslog_level@
+trophie = @trophie@
+trophie_sockname = @trophie_sockname@
+unarj = @unarj@
+uncompress = @uncompress@
+unrar = @unrar@
+uvscan = @uvscan@
+uvscan_args = @uvscan_args@
+uvscan_exitcode = @uvscan_exitcode@
+vbengcl = @vbengcl@
+vbengd = @vbengd@
+vfind = @vfind@
+vscan = @vscan@
+warnadmin = @warnadmin@
+warnrecip = @warnrecip@
+warnsender = @warnsender@
+zoo = @zoo@
+
+pkgdata_DATA = admin recip sender
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = ../../config.h
+CONFIG_CLEAN_FILES = 
+DATA =  $(pkgdata_DATA)
+
+DIST_COMMON =  Makefile.am Makefile.in
+
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = gtar
+GZIP_ENV = --best
+all: all-redirect
+.SUFFIXES:
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu amavis/notify/Makefile
+
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+
+install-pkgdataDATA: $(pkgdata_DATA)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
+	@list='$(pkgdata_DATA)'; for p in $$list; do \
+	  if test -f $(srcdir)/$$p; then \
+	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$p"; \
+	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$p; \
+	  else if test -f $$p; then \
+	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p"; \
+	    $(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p; \
+	  fi; fi; \
+	done
+
+uninstall-pkgdataDATA:
+	@$(NORMAL_UNINSTALL)
+	list='$(pkgdata_DATA)'; for p in $$list; do \
+	  rm -f $(DESTDIR)$(pkgdatadir)/$$p; \
+	done
+tags: TAGS
+TAGS:
+
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = amavis/notify
+
+distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu amavis/notify/Makefile
+	@for file in $(DISTFILES); do \
+	  d=$(srcdir); \
+	  if test -d $$d/$$file; then \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	  fi; \
+	done
+info-am:
+info: info-am
+dvi-am:
+dvi: dvi-am
+check-am: all-am
+check: check-am
+installcheck-am:
+installcheck: installcheck-am
+install-exec-am:
+install-exec: install-exec-am
+
+install-data-am: install-pkgdataDATA
+install-data: install-data-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-am
+uninstall-am: uninstall-pkgdataDATA
+uninstall: uninstall-am
+all-am: Makefile $(DATA)
+all-redirect: all-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+installdirs:
+	$(mkinstalldirs)  $(DESTDIR)$(pkgdatadir)
+
+
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+mostlyclean-am:  mostlyclean-generic
+
+mostlyclean: mostlyclean-am
+
+clean-am:  clean-generic mostlyclean-am
+
+clean: clean-am
+
+distclean-am:  distclean-generic clean-am
+
+distclean: distclean-am
+
+maintainer-clean-am:  maintainer-clean-generic distclean-am
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+
+maintainer-clean: maintainer-clean-am
+
+.PHONY: uninstall-pkgdataDATA install-pkgdataDATA tags distdir info-am \
+info dvi-am dvi check check-am installcheck-am installcheck \
+install-exec-am install-exec install-data-am install-data install-am \
+install uninstall-am uninstall all-redirect all-am all installdirs \
+mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -r -u -N amavis.orig/configure amavis/configure
--- amavis.orig/configure	Wed Aug 22 16:49:36 2001
+++ amavis/configure	Sun Aug 26 00:04:01 2001
@@ -739,7 +739,7 @@
   echo "configure: warning: ${am_backtick}missing' script is too old or missing" 1>&2
 fi
 
-for ac_prog in mawk gawk nawk awk
+for ac_prog in gawk mawk nawk awk
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -930,6 +930,10 @@
   sysconfdir=/etc
 fi
 
+if test "$datadir" == '${prefix}/share' ; then
+  datadir=$prefix/share
+fi
+
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -942,7 +946,7 @@
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:946: checking for a BSD compatible install" >&5
+echo "configure:950: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -997,7 +1001,7 @@
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1001: checking for $ac_word" >&5
+echo "configure:1005: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1027,7 +1031,7 @@
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1031: checking for $ac_word" >&5
+echo "configure:1035: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1078,7 +1082,7 @@
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1082: checking for $ac_word" >&5
+echo "configure:1086: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1110,7 +1114,7 @@
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1114: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1118: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1121,12 +1125,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 1125 "configure"
+#line 1129 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1152,12 +1156,12 @@
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1156: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1160: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1161: checking whether we are using GNU C" >&5
+echo "configure:1165: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1166,7 +1170,7 @@
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1170: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1174: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1185,7 +1189,7 @@
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1189: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1193: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1218,7 +1222,7 @@
 
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1222: checking how to run the C preprocessor" >&5
+echo "configure:1226: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -1233,13 +1237,13 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1237 "configure"
+#line 1241 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1243: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1247: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1250,13 +1254,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1254 "configure"
+#line 1258 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1260: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1264: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1267,13 +1271,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 1271 "configure"
+#line 1275 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1277: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1281: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1305,7 +1309,7 @@
 depcpp="$CPP"
 
 echo $ac_n "checking dependency style of $depcc""... $ac_c" 1>&6
-echo "configure:1309: checking dependency style of $depcc" >&5
+echo "configure:1313: checking dependency style of $depcc" >&5
 if eval "test \"`echo '$''{'am_cv_CC_dependencies_compiler_type'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1366,7 +1370,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1370: checking for $ac_word" >&5
+echo "configure:1374: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_perl'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1406,7 +1410,7 @@
 fi
 
 echo $ac_n "checking for perl modules""... $ac_c" 1>&6
-echo "configure:1410: checking for perl modules" >&5
+echo "configure:1414: checking for perl modules" >&5
 $perl $srcdir/test.pl
 if test $? -ne 0 ; then
   { echo "configure: error: You are missing some perl modules.  Please check the README" 1>&2; exit 1; }
@@ -1424,7 +1428,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1428: checking for $ac_word" >&5
+echo "configure:1432: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_file'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1472,7 +1476,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1476: checking for $ac_word" >&5
+echo "configure:1480: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_id'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1514,7 +1518,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1518: checking for $ac_word" >&5
+echo "configure:1522: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_arc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1558,7 +1562,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1562: checking for $ac_word" >&5
+echo "configure:1566: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_bunzip2'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1602,7 +1606,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1606: checking for $ac_word" >&5
+echo "configure:1610: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_lha'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1646,7 +1650,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1650: checking for $ac_word" >&5
+echo "configure:1654: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_unarj'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1690,7 +1694,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1694: checking for $ac_word" >&5
+echo "configure:1698: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_uncompress'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1740,7 +1744,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1744: checking for $ac_word" >&5
+echo "configure:1748: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_unrar'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1784,7 +1788,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1788: checking for $ac_word" >&5
+echo "configure:1792: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_zoo'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1828,7 +1832,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1832: checking for $ac_word" >&5
+echo "configure:1836: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_procmail'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1865,12 +1869,12 @@
 
 
 echo $ac_n "checking for waitpid""... $ac_c" 1>&6
-echo "configure:1869: checking for waitpid" >&5
+echo "configure:1873: checking for waitpid" >&5
 if eval "test \"`echo '$''{'ac_cv_func_waitpid'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1874 "configure"
+#line 1878 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char waitpid(); below.  */
@@ -1893,7 +1897,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:1897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_waitpid=yes"
 else
@@ -1916,12 +1920,12 @@
 for ac_func in gethostbyname
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1920: checking for $ac_func" >&5
+echo "configure:1924: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1925 "configure"
+#line 1929 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1944,7 +1948,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:1948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -1966,7 +1970,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:1970: checking for gethostbyname in -lnsl" >&5
+echo "configure:1974: checking for gethostbyname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1974,7 +1978,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1978 "configure"
+#line 1982 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1985,7 +1989,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:1989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2018,12 +2022,12 @@
 for ac_func in setsockopt
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2022: checking for $ac_func" >&5
+echo "configure:2026: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2027 "configure"
+#line 2031 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2046,7 +2050,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2068,7 +2072,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for setsockopt in -lsocket""... $ac_c" 1>&6
-echo "configure:2072: checking for setsockopt in -lsocket" >&5
+echo "configure:2076: checking for setsockopt in -lsocket" >&5
 ac_lib_var=`echo socket'_'setsockopt | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2076,7 +2080,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2080 "configure"
+#line 2084 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2087,7 +2091,7 @@
 setsockopt()
 ; return 0; }
 EOF
-if { (eval echo configure:2091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2120,12 +2124,12 @@
 for ac_func in mktemp mkdtemp strlcpy
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2124: checking for $ac_func" >&5
+echo "configure:2128: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2129 "configure"
+#line 2133 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2148,7 +2152,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2187,7 +2191,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2191: checking for $ac_word" >&5
+echo "configure:2195: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_sendmail_wrapper'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2249,7 +2253,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2253: checking for $ac_word" >&5
+echo "configure:2257: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_qmailinject'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2320,12 +2324,12 @@
   for ac_func in inet_aton
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2324: checking for $ac_func" >&5
+echo "configure:2328: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2329 "configure"
+#line 2333 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2348,7 +2352,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2370,7 +2374,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6
-echo "configure:2374: checking for inet_aton in -lresolv" >&5
+echo "configure:2378: checking for inet_aton in -lresolv" >&5
 ac_lib_var=`echo resolv'_'inet_aton | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2378,7 +2382,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2382 "configure"
+#line 2386 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2389,7 +2393,7 @@
 inet_aton()
 ; return 0; }
 EOF
-if { (eval echo configure:2393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2427,7 +2431,7 @@
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:2431: checking host system type" >&5
+echo "configure:2435: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -2455,17 +2459,17 @@
 # If it isn't, don't bother looking for the threads libraries.
 ac_safe=`echo "pthread.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for pthread.h""... $ac_c" 1>&6
-echo "configure:2459: checking for pthread.h" >&5
+echo "configure:2463: checking for pthread.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2464 "configure"
+#line 2468 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2469: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2473: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2502,9 +2506,9 @@
         save_LIBS="$LIBS"
         LIBS="$PTHREAD_LIBS $LIBS"
         echo $ac_n "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS""... $ac_c" 1>&6
-echo "configure:2506: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5
+echo "configure:2510: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5
         cat > conftest.$ac_ext <<EOF
-#line 2508 "configure"
+#line 2512 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2515,7 +2519,7 @@
 pthread_join()
 ; return 0; }
 EOF
-if { (eval echo configure:2519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   acx_pthread_ok=yes
 else
@@ -2577,18 +2581,18 @@
         case $flag in
                 none)
                 echo $ac_n "checking whether pthreads work without any flags""... $ac_c" 1>&6
-echo "configure:2581: checking whether pthreads work without any flags" >&5
+echo "configure:2585: checking whether pthreads work without any flags" >&5
                 ;;
 
                 -*)
                 echo $ac_n "checking whether pthreads work with $flag""... $ac_c" 1>&6
-echo "configure:2586: checking whether pthreads work with $flag" >&5
+echo "configure:2590: checking whether pthreads work with $flag" >&5
                 PTHREAD_CFLAGS="$flag"
                 ;;
 
                 *)
                 echo $ac_n "checking for the pthreads library -l$flag""... $ac_c" 1>&6
-echo "configure:2592: checking for the pthreads library -l$flag" >&5
+echo "configure:2596: checking for the pthreads library -l$flag" >&5
                 PTHREAD_LIBS="-l$flag"
                 ;;
         esac
@@ -2608,7 +2612,7 @@
         # functions on Solaris that doesn't have a non-functional libc stub.
         # We try pthread_create on general principles.
         cat > conftest.$ac_ext <<EOF
-#line 2612 "configure"
+#line 2616 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 int main() {
@@ -2617,7 +2621,7 @@
                      pthread_create(0,0,0,0); pthread_cleanup_pop(0); 
 ; return 0; }
 EOF
-if { (eval echo configure:2621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   acx_pthread_ok=yes
 else
@@ -2649,16 +2653,16 @@
         # Detect AIX lossage: threads are created detached by default
         # and the JOINABLE attribute has a nonstandard name (UNDETACHED).
         echo $ac_n "checking for joinable pthread attribute""... $ac_c" 1>&6
-echo "configure:2653: checking for joinable pthread attribute" >&5
+echo "configure:2657: checking for joinable pthread attribute" >&5
         cat > conftest.$ac_ext <<EOF
-#line 2655 "configure"
+#line 2659 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 int main() {
 int attr=PTHREAD_CREATE_JOINABLE;
 ; return 0; }
 EOF
-if { (eval echo configure:2662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ok=PTHREAD_CREATE_JOINABLE
 else
@@ -2670,14 +2674,14 @@
 rm -f conftest*
         if test x"$ok" = xunknown; then
                 cat > conftest.$ac_ext <<EOF
-#line 2674 "configure"
+#line 2678 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 int main() {
 int attr=PTHREAD_CREATE_UNDETACHED;
 ; return 0; }
 EOF
-if { (eval echo configure:2681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ok=PTHREAD_CREATE_UNDETACHED
 else
@@ -2700,7 +2704,7 @@
         fi
 
         echo $ac_n "checking if more special flags are required for pthreads""... $ac_c" 1>&6
-echo "configure:2704: checking if more special flags are required for pthreads" >&5
+echo "configure:2708: checking if more special flags are required for pthreads" >&5
         flag=no
         case "${host_cpu}-${host_os}" in
                 *-aix* | *-freebsd*)     flag="-D_THREAD_SAFE";;
@@ -2718,7 +2722,7 @@
         # Extract the first word of "cc_r", so it can be a program name with args.
 set dummy cc_r; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2722: checking for $ac_word" >&5
+echo "configure:2726: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_PTHREAD_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2764,17 +2768,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2768: checking for $ac_hdr" >&5
+echo "configure:2772: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2773 "configure"
+#line 2777 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2778: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2782: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2795,7 +2799,7 @@
 #define $ac_tr_hdr 1
 EOF
  cat > conftest.$ac_ext <<EOF
-#line 2799 "configure"
+#line 2803 "configure"
 #include "confdefs.h"
 #include <sm/gen.h>
 EOF
@@ -2817,7 +2821,7 @@
 
     # maybe sendmail is using sfio (for TLS encryption)
     echo $ac_n "checking for _stdprintf in -lsfio""... $ac_c" 1>&6
-echo "configure:2821: checking for _stdprintf in -lsfio" >&5
+echo "configure:2825: checking for _stdprintf in -lsfio" >&5
 ac_lib_var=`echo sfio'_'_stdprintf | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2825,7 +2829,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsfio  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2829 "configure"
+#line 2833 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2836,7 +2840,7 @@
 _stdprintf()
 ; return 0; }
 EOF
-if { (eval echo configure:2840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2867,7 +2871,7 @@
     # sendmail 8.11: need -lsmutil
     # sendmail 8.12: need -lsm
     echo $ac_n "checking for errstring in -lsmutil""... $ac_c" 1>&6
-echo "configure:2871: checking for errstring in -lsmutil" >&5
+echo "configure:2875: checking for errstring in -lsmutil" >&5
 ac_lib_var=`echo smutil'_'errstring | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2875,7 +2879,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsmutil  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2879 "configure"
+#line 2883 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2886,7 +2890,7 @@
 errstring()
 ; return 0; }
 EOF
-if { (eval echo configure:2890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2912,7 +2916,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for sm_errstring in -lsm""... $ac_c" 1>&6
-echo "configure:2916: checking for sm_errstring in -lsm" >&5
+echo "configure:2920: checking for sm_errstring in -lsm" >&5
 ac_lib_var=`echo sm'_'sm_errstring | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2920,7 +2924,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2924 "configure"
+#line 2928 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2931,7 +2935,7 @@
 sm_errstring()
 ; return 0; }
 EOF
-if { (eval echo configure:2935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2965,17 +2969,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2969: checking for $ac_hdr" >&5
+echo "configure:2973: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2974 "configure"
+#line 2978 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2979: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2983: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2996,7 +3000,7 @@
 #define $ac_tr_hdr 1
 EOF
  echo $ac_n "checking for smfi_main in -lmilter""... $ac_c" 1>&6
-echo "configure:3000: checking for smfi_main in -lmilter" >&5
+echo "configure:3004: checking for smfi_main in -lmilter" >&5
 ac_lib_var=`echo milter'_'smfi_main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3004,7 +3008,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lmilter  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3008 "configure"
+#line 3012 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3015,7 +3019,7 @@
 smfi_main()
 ; return 0; }
 EOF
-if { (eval echo configure:3019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3121,7 +3125,7 @@
 
 if test "x$MTA" = "xsendmail" -a "x$enable_relay" = "xyes" ; then
   echo $ac_n "checking original sendmail config file""... $ac_c" 1>&6
-echo "configure:3125: checking original sendmail config file" >&5
+echo "configure:3129: checking original sendmail config file" >&5
   # Check whether --with-origconf or --without-origconf was given.
 if test "${with_origconf+set}" = set; then
   withval="$with_origconf"
@@ -3170,7 +3174,7 @@
   fi
 
     echo $ac_n "checking whether libnet module is installed""... $ac_c" 1>&6
-echo "configure:3174: checking whether libnet module is installed" >&5
+echo "configure:3178: checking whether libnet module is installed" >&5
   $perl -e "use Net::SMTP;" >/dev/null 2>&1
   if test $? -eq 0 ; then
     echo "$ac_t""yes" 1>&6
@@ -3181,7 +3185,7 @@
   fi
 
   echo $ac_n "checking SMTP port to deliver scanned mails to""... $ac_c" 1>&6
-echo "configure:3185: checking SMTP port to deliver scanned mails to" >&5
+echo "configure:3189: checking SMTP port to deliver scanned mails to" >&5
   smtp_port=10025
   # Check whether --with-smtp_port or --without-smtp_port was given.
 if test "${with_smtp_port+set}" = set; then
@@ -3250,13 +3254,13 @@
 avp_scanner_frag=/dev/null
 avpdc_scanner_frag=/dev/null
 echo "checking *** Kaspersky Anti-Virus (AVPDaemon) ***" 1>&6
-echo "configure:3254: checking *** Kaspersky Anti-Virus (AVPDaemon) ***" >&5
+echo "configure:3258: checking *** Kaspersky Anti-Virus (AVPDaemon) ***" >&5
 for ac_prog in AvpDaemon AvpBSDDaemon kavdaemon
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3260: checking for $ac_word" >&5
+echo "configure:3264: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_avpd'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3295,13 +3299,13 @@
 
   ### Kaspersky AVPDaemonClient
   echo "checking *** Kaspersky AVPDaemonClient ***" 1>&6
-echo "configure:3299: checking *** Kaspersky AVPDaemonClient ***" >&5
+echo "configure:3303: checking *** Kaspersky AVPDaemonClient ***" >&5
   for ac_prog in AvpDaemonClient
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3305: checking for $ac_word" >&5
+echo "configure:3309: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_avpdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3340,13 +3344,13 @@
 
     ### Kaspersky AVPDaemonTst
     echo "checking *** Kaspersky AVPDaemonTst ***" 1>&6
-echo "configure:3344: checking *** Kaspersky AVPDaemonTst ***" >&5
+echo "configure:3348: checking *** Kaspersky AVPDaemonTst ***" >&5
     for ac_prog in AvpDaemonTst
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3350: checking for $ac_word" >&5
+echo "configure:3354: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_avpdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3397,13 +3401,13 @@
 ### Kaspersky Anti-Virus (command line version)
 if test "x$avpd" = "x" -a "x$avpdc" = "x" ; then
   echo "checking *** Kaspersky Anti-Virus ***" 1>&6
-echo "configure:3401: checking *** Kaspersky Anti-Virus ***" >&5
+echo "configure:3405: checking *** Kaspersky Anti-Virus ***" >&5
   for ac_prog in AvpLinux kavscanner
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3407: checking for $ac_word" >&5
+echo "configure:3411: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_avp'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3447,13 +3451,13 @@
 ### CAI InoculateIT Inocucmd command line utility 4.0
 cai_scanner_frag=/dev/null
 echo "checking *** CAI InoculateIT Inocucmd command line utility 4.0 ***" 1>&6
-echo "configure:3451: checking *** CAI InoculateIT Inocucmd command line utility 4.0 ***" >&5
+echo "configure:3455: checking *** CAI InoculateIT Inocucmd command line utility 4.0 ***" >&5
 for ac_prog in inocucmd
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3457: checking for $ac_word" >&5
+echo "configure:3461: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_inocucmd'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3496,11 +3500,11 @@
 ### Command AntiVirus for Linux
 csav_scanner_frag=/dev/null
 echo "checking *** Command AntiVirus for Linux ***" 1>&6
-echo "configure:3500: checking *** Command AntiVirus for Linux ***" >&5
+echo "configure:3504: checking *** Command AntiVirus for Linux ***" >&5
 # Extract the first word of "csav", so it can be a program name with args.
 set dummy csav; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3504: checking for $ac_word" >&5
+echo "configure:3508: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_csav'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3540,13 +3544,13 @@
 ### CyberSoft vfind
 cyber_scanner_frag=/dev/null
 echo "checking *** CyberSoft vfind ***" 1>&6
-echo "configure:3544: checking *** CyberSoft vfind ***" >&5
+echo "configure:3548: checking *** CyberSoft vfind ***" >&5
 for ac_prog in vfind
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3550: checking for $ac_word" >&5
+echo "configure:3554: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_vfind'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3589,11 +3593,11 @@
 ### FRISK F-Prot Antivirus for Linux
 fprot_scanner_frag=/dev/null
 echo "checking *** FRISK F-Prot Antivirus for Linux ***" 1>&6
-echo "configure:3593: checking *** FRISK F-Prot Antivirus for Linux ***" >&5
+echo "configure:3597: checking *** FRISK F-Prot Antivirus for Linux ***" >&5
 # Extract the first word of "f-prot f-prot.sh", so it can be a program name with args.
 set dummy f-prot f-prot.sh; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3597: checking for $ac_word" >&5
+echo "configure:3601: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_fprot'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3633,13 +3637,13 @@
 ### DataFellows F-Secure AntiVirus
 fsec_scanner_frag=/dev/null
 echo "checking *** DataFellows F-Secure AntiVirus ***" 1>&6
-echo "configure:3637: checking *** DataFellows F-Secure AntiVirus ***" >&5
+echo "configure:3641: checking *** DataFellows F-Secure AntiVirus ***" >&5
 for ac_prog in fsav
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3643: checking for $ac_word" >&5
+echo "configure:3647: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_fsav'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3682,13 +3686,13 @@
 ### H+BEDV AntiVir/X
 hbedv_scanner_frag=/dev/null
 echo "checking *** H+BEDV AntiVir/X ***" 1>&6
-echo "configure:3686: checking *** H+BEDV AntiVir/X ***" >&5
+echo "configure:3690: checking *** H+BEDV AntiVir/X ***" >&5
 for ac_prog in antivir
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3692: checking for $ac_word" >&5
+echo "configure:3696: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_antivir'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3731,13 +3735,13 @@
 ### McAfee Virusscan
 nai_scanner_frag=/dev/null
 echo "checking *** McAfee Virusscan ***" 1>&6
-echo "configure:3735: checking *** McAfee Virusscan ***" >&5
+echo "configure:3739: checking *** McAfee Virusscan ***" >&5
 for ac_prog in uvscan
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3741: checking for $ac_word" >&5
+echo "configure:3745: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_uvscan'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3776,7 +3780,7 @@
   avscanner="$avscanner McAfee Virusscan"
   nai_scanner_frag=$srcdir/amavis/av/nai
   echo $ac_n "checking NAI Anti Virus (uvscan) version""... $ac_c" 1>&6
-echo "configure:3780: checking NAI Anti Virus (uvscan) version" >&5
+echo "configure:3784: checking NAI Anti Virus (uvscan) version" >&5
   $uvscan --version 2>&1 | head -1 | grep " v4." >/dev/null 2>&1
   if test $? -eq 0 ; then
     echo "$ac_t""4.x" 1>&6
@@ -3794,13 +3798,13 @@
 ### ESOFT NOD32
 nod32_scanner_frag=/dev/null
 echo "checking *** ESOFT NOD32 ***" 1>&6
-echo "configure:3798: checking *** ESOFT NOD32 ***" >&5
+echo "configure:3802: checking *** ESOFT NOD32 ***" >&5
 for ac_prog in nod32
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3804: checking for $ac_word" >&5
+echo "configure:3808: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_nod32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3843,13 +3847,13 @@
 ### GeCAD RAV AntiVirus 8
 rav_scanner_frag=/dev/null
 echo "checking *** GeCAD RAV AntiVirus 8 ***" 1>&6
-echo "configure:3847: checking *** GeCAD RAV AntiVirus 8 ***" >&5
+echo "configure:3851: checking *** GeCAD RAV AntiVirus 8 ***" >&5
 for ac_prog in ravlin8
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3853: checking for $ac_word" >&5
+echo "configure:3857: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_rav'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3892,13 +3896,13 @@
 ### Sophie (via Sophos SAVI)
 sophie_scanner_frag=/dev/null
 echo "checking *** Sophie (via Sophos SAVI) ***" 1>&6
-echo "configure:3896: checking *** Sophie (via Sophos SAVI) ***" >&5
+echo "configure:3900: checking *** Sophie (via Sophos SAVI) ***" >&5
 for ac_prog in sophie
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3902: checking for $ac_word" >&5
+echo "configure:3906: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_sophie'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3936,7 +3940,7 @@
 if test "x$sophie" != "x" ; then
   # ask sophie for socket location - requires 1.15+ or patched older release
   echo $ac_n "checking for Sophie socket location""... $ac_c" 1>&6
-echo "configure:3940: checking for Sophie socket location" >&5
+echo "configure:3944: checking for Sophie socket location" >&5
   sophie_sockname=`$sophie -v 2>&1 |sed -n '/Socket/ s/^.* "\(.*\)"/\1/p'`
   if test "x$sophie_sockname" = "x" ; then
     echo "configure: warning: you need Sophie release 1.15 or better!" 1>&2
@@ -3951,11 +3955,11 @@
 ### Sophos Sweep
 sophos_scanner_frag=/dev/null
 echo "checking *** Sophos Sweep ***" 1>&6
-echo "configure:3955: checking *** Sophos Sweep ***" >&5
+echo "configure:3959: checking *** Sophos Sweep ***" >&5
 # Extract the first word of "sweep", so it can be a program name with args.
 set dummy sweep; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3959: checking for $ac_word" >&5
+echo "configure:3963: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_sophos'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3989,7 +3993,7 @@
 
 if test "x$sophos" != "x" ; then
           echo $ac_n "checking if $sophos really is Sophos Sweep""... $ac_c" 1>&6
-echo "configure:3993: checking if $sophos really is Sophos Sweep" >&5
+echo "configure:3997: checking if $sophos really is Sophos Sweep" >&5
   ${sophos} -v | grep -i "sophos plc" >/dev/null 2>&1
   if test $? -eq 0 ; then
     echo "$ac_t""yes" 1>&6
@@ -4019,7 +4023,7 @@
 
     if test x"$sophos_ide" != x ; then
       echo $ac_n "checking where Sophos Sweep looks for virus identities""... $ac_c" 1>&6
-echo "configure:4023: checking where Sophos Sweep looks for virus identities" >&5
+echo "configure:4027: checking where Sophos Sweep looks for virus identities" >&5
       if test -d ${sophos_ide} ; then
         echo "$ac_t""${sophos_ide}" 1>&6
       else
@@ -4032,13 +4036,13 @@
 ### Trophie (via Trend Micro API)
 trophie_scanner_frag=/dev/null
 echo "checking *** Trophie (via Trend Micro API) ***" 1>&6
-echo "configure:4036: checking *** Trophie (via Trend Micro API) ***" >&5
+echo "configure:4040: checking *** Trophie (via Trend Micro API) ***" >&5
 for ac_prog in trophie
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4042: checking for $ac_word" >&5
+echo "configure:4046: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_trophie'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4076,7 +4080,7 @@
 if test "x$trophie" != "x" ; then
   # ask trophie for socket location - requires 1.04+ or patched older release
   echo $ac_n "checking for Trophie socket location""... $ac_c" 1>&6
-echo "configure:4080: checking for Trophie socket location" >&5
+echo "configure:4084: checking for Trophie socket location" >&5
   trophie_sockname=`$trophie -v 2>&1 |sed -n '/Socket/ s/^.* "\(.*\)"/\1/p'`
   if test "x$trophie_sockname" = "x" ; then
     echo "configure: warning: you need Trophie release 1.03 or better!" 1>&2
@@ -4091,13 +4095,13 @@
 ### Trend Micro FileScanner
 trend_scanner_frag=/dev/null
 echo "checking *** Trend Micro FileScanner ***" 1>&6
-echo "configure:4095: checking *** Trend Micro FileScanner ***" >&5
+echo "configure:4099: checking *** Trend Micro FileScanner ***" >&5
 for ac_prog in vscan
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4101: checking for $ac_word" >&5
+echo "configure:4105: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_vscan'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4140,13 +4144,13 @@
 ### VirusBuster VBengDaemon
 vbuster_scanner_frag=/dev/null
 echo "checking *** VirusBuster VBengDaemon ***" 1>&6
-echo "configure:4144: checking *** VirusBuster VBengDaemon ***" >&5
+echo "configure:4148: checking *** VirusBuster VBengDaemon ***" >&5
 for ac_prog in vbengd
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4150: checking for $ac_word" >&5
+echo "configure:4154: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_vbengd'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4184,13 +4188,13 @@
 
 ### VirusBuster VBengClient
 echo "checking *** VirusBuster VBengClient ***" 1>&6
-echo "configure:4188: checking *** VirusBuster VBengClient ***" >&5
+echo "configure:4192: checking *** VirusBuster VBengClient ***" >&5
 for ac_prog in vbengcl
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4194: checking for $ac_word" >&5
+echo "configure:4198: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_vbengcl'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4240,7 +4244,7 @@
 
 
 echo $ac_n "checking if any virus scanners are installed at all""... $ac_c" 1>&6
-echo "configure:4244: checking if any virus scanners are installed at all" >&5
+echo "configure:4248: checking if any virus scanners are installed at all" >&5
 if test "x$antivir$uvscan$ufindvir$fvsco$sophos$avp$avpdc$fsav$vscan$vfind$inocucmd$rav$nod32$csav$vbengcl$sophie$trophie" = "x" ; then
   echo "$ac_t""no" 1>&6
   { echo "configure: error: 
@@ -4260,7 +4264,7 @@
 
 runtime_dir=/var/amavis
 echo $ac_n "checking for runtime directory""... $ac_c" 1>&6
-echo "configure:4264: checking for runtime directory" >&5
+echo "configure:4268: checking for runtime directory" >&5
 # Check whether --with-runtime-dir or --without-runtime-dir was given.
 if test "${with_runtime_dir+set}" = set; then
   withval="$with_runtime_dir"
@@ -4275,7 +4279,7 @@
 
 
 echo $ac_n "checking whether to use syslog""... $ac_c" 1>&6
-echo "configure:4279: checking whether to use syslog" >&5
+echo "configure:4283: checking whether to use syslog" >&5
 # Check whether --enable-syslog or --disable-syslog was given.
 if test "${enable_syslog+set}" = set; then
   enableval="$enable_syslog"
@@ -4298,7 +4302,7 @@
 
 if test "$do_syslog" = "yes" ; then
   echo $ac_n "checking syslog facility.level""... $ac_c" 1>&6
-echo "configure:4302: checking syslog facility.level" >&5
+echo "configure:4306: checking syslog facility.level" >&5
   # Check whether --with-syslog-level or --without-syslog-level was given.
 if test "${with_syslog_level+set}" = set; then
   withval="$with_syslog_level"
@@ -4309,7 +4313,7 @@
   
 else
     echo $ac_n "checking directory for logfile(s)""... $ac_c" 1>&6
-echo "configure:4313: checking directory for logfile(s)" >&5
+echo "configure:4317: checking directory for logfile(s)" >&5
   # Check whether --with-logdir or --without-logdir was given.
 if test "${with_logdir+set}" = set; then
   withval="$with_logdir"
@@ -4321,7 +4325,7 @@
 
 
 echo $ac_n "checking user id amavis(d) runs as""... $ac_c" 1>&6
-echo "configure:4325: checking user id amavis(d) runs as" >&5
+echo "configure:4329: checking user id amavis(d) runs as" >&5
 # Check whether --with-amavisuser or --without-amavisuser was given.
 if test "${with_amavisuser+set}" = set; then
   withval="$with_amavisuser"
@@ -4345,7 +4349,7 @@
 
 
 echo $ac_n "checking send notification to sender""... $ac_c" 1>&6
-echo "configure:4349: checking send notification to sender" >&5
+echo "configure:4353: checking send notification to sender" >&5
 # Check whether --with-warnsender or --without-warnsender was given.
 if test "${with_warnsender+set}" = set; then
   withval="$with_warnsender"
@@ -4356,18 +4360,16 @@
 
 
 echo "$ac_t""$warnsender" 1>&6
-warn_sender_frag=$srcdir/amavis/notify/sender
-if test "x$warnsender" != "xno"; then
-  if test "x$warnsender" != "xyes"; then
-    warn_sender_frag="$warnsender"
-  fi
-  warnsender=yes
+if test "x$warnsender" == "xyes"; then
+  warnsender=$datadir/$PACKAGE/sender
+fi
+if test "x$warnsender" == "xno"; then
+  warnsender=""
 fi
-
 
 
 echo $ac_n "checking send notification to recipient(s)""... $ac_c" 1>&6
-echo "configure:4371: checking send notification to recipient(s)" >&5
+echo "configure:4373: checking send notification to recipient(s)" >&5
 # Check whether --with-warnrecip or --without-warnrecip was given.
 if test "${with_warnrecip+set}" = set; then
   withval="$with_warnrecip"
@@ -4378,14 +4380,12 @@
 
 
 echo "$ac_t""$warnrecip" 1>&6
-warn_recip_frag=$srcdir/amavis/notify/recip
-if test "x$warnrecip" != "xno"; then
-  if test "x$warnrecip" != "xyes"; then
-    warn_recip_frag="$warnrecip"
-  fi
-  warnrecip=yes
+if test "x$warnrecip" == "xyes"; then
+  warnrecip=$datadir/$PACKAGE/recip
+fi
+if test "x$warnrecip" == "xno"; then
+  warnrecip=""
 fi
-
 
 
 echo $ac_n "checking send notification to admin""... $ac_c" 1>&6
@@ -4400,18 +4400,16 @@
 
 
 echo "$ac_t""$warnadmin" 1>&6
-warn_admin_frag=$srcdir/amavis/notify/admin
-if test "x$warnadmin" != "xno"; then
-  if test "x$warnadmin" != "xyes"; then
-    warn_admin_frag="$warnadmin"
-  fi
-  warnadmin=yes
+if test "x$warnadmin" == "xyes"; then
+  warnadmin=$datadir/$PACKAGE/admin
+fi
+if test "x$warnadmin" == "xno"; then
+  warnadmin=""
 fi
-
 
 
 echo $ac_n "checking socket name""... $ac_c" 1>&6
-echo "configure:4415: checking socket name" >&5
+echo "configure:4413: checking socket name" >&5
 # Check whether --with-sockname or --without-sockname was given.
 if test "${with_sockname+set}" = set; then
   withval="$with_sockname"
@@ -4551,6 +4549,7 @@
 
 trap 'rm -fr `echo " Makefile            \
             amavis/Makefile     \
+            amavis/notify/Makefile     \
             amavis/checkaccount \
             amavis/amavisd      \
             amavis/amavisd.conf \
@@ -4676,14 +4675,8 @@
 s%@logdir@%$logdir%g
 s%@amavisuser@%$amavisuser%g
 s%@warnsender@%$warnsender%g
-/@warn_sender_frag@/r $warn_sender_frag
-s%@warn_sender_frag@%%g
 s%@warnrecip@%$warnrecip%g
-/@warn_recip_frag@/r $warn_recip_frag
-s%@warn_recip_frag@%%g
 s%@warnadmin@%$warnadmin%g
-/@warn_admin_frag@/r $warn_admin_frag
-s%@warn_admin_frag@%%g
 s%@sockname@%$sockname%g
 /@avp_scanner_frag@/r $avp_scanner_frag
 s%@avp_scanner_frag@%%g
@@ -4761,6 +4754,7 @@
 
 CONFIG_FILES=\${CONFIG_FILES-"Makefile            \
             amavis/Makefile     \
+            amavis/notify/Makefile     \
             amavis/checkaccount \
             amavis/amavisd      \
             amavis/amavisd.conf \
diff -r -u -N amavis.orig/configure.in amavis/configure.in
--- amavis.orig/configure.in	Wed Aug 22 16:46:40 2001
+++ amavis/configure.in	Sun Aug 26 00:03:54 2001
@@ -31,6 +31,11 @@
   sysconfdir=/etc
 fi
 
+dnl If --datadir not specified, default to $prefix/share
+if test "$datadir" == '${prefix}/share' ; then
+  datadir=$prefix/share
+fi
+
 dnl Check for programs.
 AC_PROG_INSTALL
 AC_PROG_CC
@@ -722,15 +727,13 @@
   warnsender=$withval, warnsender="yes")
 
 AC_MSG_RESULT([$warnsender])
-warn_sender_frag=$srcdir/amavis/notify/sender
-if test "x$warnsender" != "xno"; then
-  if test "x$warnsender" != "xyes"; then
-    warn_sender_frag="$warnsender"
-  fi
-  warnsender=yes
+if test "x$warnsender" == "xyes"; then
+  warnsender=$datadir/$PACKAGE/sender
+fi
+if test "x$warnsender" == "xno"; then
+  warnsender=""
 fi
 AC_SUBST(warnsender)
-AC_SUBST_FILE(warn_sender_frag)
 
 dnl Send notification to recipient?
 AC_MSG_CHECKING([send notification to recipient(s)])
@@ -739,15 +742,13 @@
   warnrecip=$withval, warnrecip="no")
 
 AC_MSG_RESULT([$warnrecip])
-warn_recip_frag=$srcdir/amavis/notify/recip
-if test "x$warnrecip" != "xno"; then
-  if test "x$warnrecip" != "xyes"; then
-    warn_recip_frag="$warnrecip"
-  fi
-  warnrecip=yes
+if test "x$warnrecip" == "xyes"; then
+  warnrecip=$datadir/$PACKAGE/recip
+fi
+if test "x$warnrecip" == "xno"; then
+  warnrecip=""
 fi
 AC_SUBST(warnrecip)
-AC_SUBST_FILE(warn_recip_frag)
 
 dnl Mail reports to admin?
 AC_MSG_CHECKING([send notification to admin])
@@ -756,15 +757,13 @@
   warnadmin=$withval, warnadmin="yes")
 
 AC_MSG_RESULT([$warnadmin])
-warn_admin_frag=$srcdir/amavis/notify/admin
-if test "x$warnadmin" != "xno"; then
-  if test "x$warnadmin" != "xyes"; then
-    warn_admin_frag="$warnadmin"
-  fi
-  warnadmin=yes
+if test "x$warnadmin" == "xyes"; then
+  warnadmin=$datadir/$PACKAGE/admin
+fi
+if test "x$warnadmin" == "xno"; then
+  warnadmin=""
 fi
 AC_SUBST(warnadmin)
-AC_SUBST_FILE(warn_admin_frag)
 
 dnl Path to socket for d/c communication
 AC_MSG_CHECKING([socket name])
@@ -799,6 +798,7 @@
 
 AC_OUTPUT([ Makefile            \
             amavis/Makefile     \
+            amavis/notify/Makefile     \
             amavis/checkaccount \
             amavis/amavisd      \
             amavis/amavisd.conf \