diff -Nura amavis-perl-11-orig/Makefile.in amavis-perl-11/Makefile.in
--- amavis-perl-11-orig/Makefile.in Fri Apr 6 15:16:54 2001
+++ amavis-perl-11/Makefile.in Mon Apr 22 00:33:30 2002
@@ -1,7 +1,6 @@
-# Makefile.in generated automatically by automake 1.4c from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 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.
@@ -11,6 +10,7 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
+
SHELL = @SHELL@
srcdir = @srcdir@
@@ -32,6 +32,8 @@
includedir = @includedir@
oldincludedir = /usr/include
+DESTDIR =
+
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
@@ -44,10 +46,9 @@
AUTOHEADER = @AUTOHEADER@
INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
transform = @program_transform_name@
NORMAL_INSTALL = :
@@ -56,8 +57,6 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-
-@SET_MAKE@
host_alias = @host_alias@
host_triplet = @host@
AMAVIS_MILTER = @AMAVIS_MILTER@
@@ -87,6 +86,7 @@
avpd = @avpd@
avpdc = @avpdc@
bunzip2 = @bunzip2@
+clamscan = @clamscan@
credits = @credits@
csav = @csav@
do_syslog = @do_syslog@
@@ -132,31 +132,28 @@
warnsender = @warnsender@
zoo = @zoo@
-
SUBDIRS = amavis tests
EXTRA_DIST = reconf test.pl HINTS BUGS FAQ README.exim README.milter README.postfix README.qmail README.scanners README.sendmail doc/amavis.html doc/amavis.m4 doc/amavis.png doc/amavis.txt
-subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
-DIST_SOURCES =
DIST_COMMON = README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \
Makefile.am Makefile.in NEWS TODO acconfig.h aclocal.m4 config.guess \
config.h.in config.sub configure configure.in install-sh missing \
mkinstalldirs
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+TAR = tar
GZIP_ENV = --best
-DIST_SUBDIRS = $(SUBDIRS)
all: all-redirect
.SUFFIXES:
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
cd $(top_builddir) \
&& CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
@@ -174,22 +171,18 @@
$(MAKE) stamp-h; \
else :; fi
stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
- @rm -f stamp-h stamp-hT
- @echo timestamp > stamp-hT 2> /dev/null
cd $(top_builddir) \
&& CONFIG_FILES= CONFIG_HEADERS=config.h \
$(SHELL) ./config.status
- @mv stamp-hT stamp-h
-$(srcdir)/config.h.in: $(srcdir)/./stamp-h.in
+ @echo timestamp > stamp-h 2> /dev/null
+$(srcdir)/config.h.in: $(srcdir)/stamp-h.in
@if test ! -f $@; then \
- rm -f $(srcdir)/./stamp-h.in; \
- $(MAKE) $(srcdir)/./stamp-h.in; \
+ rm -f $(srcdir)/stamp-h.in; \
+ $(MAKE) $(srcdir)/stamp-h.in; \
else :; fi
-$(srcdir)/./stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
- @rm -f $(srcdir)/./stamp-h.in $(srcdir)/./stamp-h.inT
- @echo timestamp > $(srcdir)/./stamp-h.inT 2> /dev/null
+$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
cd $(top_srcdir) && $(AUTOHEADER)
- @mv $(srcdir)/./stamp-h.inT $(srcdir)/./stamp-h.in
+ @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
mostlyclean-hdr:
@@ -207,6 +200,8 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
+@SET_MAKE@
+
all-recursive install-data-recursive install-exec-recursive \
installdirs-recursive install-recursive uninstall-recursive \
check-recursive installcheck-recursive info-recursive dvi-recursive:
@@ -232,16 +227,11 @@
maintainer-clean-recursive:
@set fnord $(MAKEFLAGS); amf=$$2; \
dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
- *) list='$(SUBDIRS)' ;; \
- esac; \
- rev=''; for subdir in $$list; do \
- if test "$$subdir" = "."; then :; else \
- rev="$$subdir $$rev"; \
- fi; \
+ rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+ rev="$$subdir $$rev"; \
+ test "$$subdir" = "." && dot_seen=yes; \
done; \
- rev="$$rev ."; \
+ test "$$dot_seen" = "no" && rev=". $$rev"; \
target=`echo $@ | sed s/-recursive//`; \
for subdir in $$rev; do \
echo "Making $$target in $$subdir"; \
@@ -260,17 +250,15 @@
tags: TAGS
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) ' { files[$$0] = 1; } \
+ID: $(HEADERS) $(SOURCES) $(LISP)
+ list='$(SOURCES) $(HEADERS)'; \
+ unique=`for i in $$list; do echo $$i; done | \
+ awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- mkid -fID $$unique $(LISP)
+ here=`pwd` && cd $(srcdir) \
+ && mkid -f$$here/ID $$unique $(LISP)
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
tags=; \
here=`pwd`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -278,19 +266,12 @@
test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
fi; \
done; \
- list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) ' { files[$$0] = 1; } \
+ list='$(SOURCES) $(HEADERS)'; \
+ unique=`for i in $$list; do echo $$i; done | \
+ awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
- || etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP)
-
-GTAGS:
- here=`CDPATH=: && cd $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $$here
+ || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS)
mostlyclean-tags:
@@ -304,66 +285,55 @@
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
-
# This target untars the dist file and tries a VPATH configuration. Then
# it guarantees that the distribution is self-contained by making another
# tarfile.
distcheck: dist
- -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
- chmod -R a-w $(distdir); chmod a+w $(distdir)
+ -rm -rf $(distdir)
+ GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
mkdir $(distdir)/=build
mkdir $(distdir)/=inst
- chmod a-w $(distdir)
- dc_install_base=`CDPATH=: && cd $(distdir)/=inst && pwd` \
- && cd $(distdir)/=build \
+ dc_install_base=`cd $(distdir)/=inst && pwd`; \
+ cd $(distdir)/=build \
&& ../configure --srcdir=.. --prefix=$$dc_install_base \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
&& $(MAKE) $(AM_MAKEFLAGS) install \
&& $(MAKE) $(AM_MAKEFLAGS) installcheck \
- && $(MAKE) $(AM_MAKEFLAGS) uninstall \
- && test `find $$dc_install_base -type f -print | wc -l` -le 1 \
- && $(MAKE) $(AM_MAKEFLAGS) dist \
- && $(MAKE) $(AM_MAKEFLAGS) distclean \
- && rm -f $(distdir).tar.gz \
- && test `find . -type f -print | wc -l` -eq 0
- -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
+ && $(MAKE) $(AM_MAKEFLAGS) dist
+ -rm -rf $(distdir)
@banner="$(distdir).tar.gz is ready for distribution"; \
dashes=`echo "$$banner" | sed s/./=/g`; \
echo "$$dashes"; \
echo "$$banner"; \
echo "$$dashes"
dist: distdir
- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
- ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
- || chmod -R a+r $(distdir)
- $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c > $(distdir).tar.gz
- -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
+ -chmod -R a+r $(distdir)
+ GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
+ -rm -rf $(distdir)
dist-all: distdir
- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
- ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
- || chmod -R a+r $(distdir)
- $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c > $(distdir).tar.gz
- -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
+ -chmod -R a+r $(distdir)
+ GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
+ -rm -rf $(distdir)
distdir: $(DISTFILES)
- -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
+ -rm -rf $(distdir)
mkdir $(distdir)
+ -chmod 777 $(distdir)
+ here=`cd $(top_builddir) && pwd`; \
+ top_distdir=`cd $(distdir) && pwd`; \
+ distdir=`cd $(distdir) && pwd`; \
+ cd $(top_srcdir) \
+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
$(mkinstalldirs) $(distdir)/doc
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
- cp -pR $$d/$$file $(distdir) \
- || exit 1; \
+ cp -pr $$d/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
- || exit 1; \
+ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+ || cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
for subdir in $(SUBDIRS); do \
@@ -371,6 +341,7 @@
test -d $(distdir)/$$subdir \
|| mkdir $(distdir)/$$subdir \
|| exit 1; \
+ chmod 777 $(distdir)/$$subdir; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
|| exit 1; \
fi; \
@@ -401,7 +372,7 @@
all-am: Makefile config.h
all-redirect: all-recursive-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
+ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
installdirs: installdirs-recursive
installdirs-am:
@@ -415,7 +386,6 @@
-rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
- -rm -f Makefile.in
mostlyclean-am: mostlyclean-hdr mostlyclean-tags mostlyclean-generic
mostlyclean: mostlyclean-recursive
@@ -438,8 +408,7 @@
-rm -f config.status
.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
-install-recursive uninstall-recursive install-data-recursive \
-uninstall-data-recursive install-exec-recursive \
+install-data-recursive uninstall-data-recursive install-exec-recursive \
uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
all-recursive check-recursive installcheck-recursive info-recursive \
dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
@@ -447,10 +416,9 @@
distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \
install-exec-am install-exec install-data-am install-data install-am \
-install uninstall-am uninstall all-redirect all-am all install-strip \
-installdirs-am installdirs mostlyclean-generic distclean-generic \
-clean-generic maintainer-clean-generic clean mostlyclean distclean \
-maintainer-clean
+install uninstall-am uninstall all-redirect all-am all installdirs-am \
+installdirs mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
dist-hook:
diff -Nura amavis-perl-11-orig/amavis/Makefile.in amavis-perl-11/amavis/Makefile.in
--- amavis-perl-11-orig/amavis/Makefile.in Fri Apr 6 15:17:08 2001
+++ amavis-perl-11/amavis/Makefile.in Mon Apr 22 00:33:30 2002
@@ -1,7 +1,6 @@
-# Makefile.in generated automatically by automake 1.4c from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 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.
@@ -11,6 +10,7 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
+
SHELL = @SHELL@
srcdir = @srcdir@
@@ -32,6 +32,8 @@
includedir = @includedir@
oldincludedir = /usr/include
+DESTDIR =
+
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
@@ -44,10 +46,9 @@
AUTOHEADER = @AUTOHEADER@
INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
transform = @program_transform_name@
NORMAL_INSTALL = :
@@ -56,8 +57,6 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-
-@SET_MAKE@
host_alias = @host_alias@
host_triplet = @host@
AMAVIS_MILTER = @AMAVIS_MILTER@
@@ -87,6 +86,7 @@
avpd = @avpd@
avpdc = @avpdc@
bunzip2 = @bunzip2@
+clamscan = @clamscan@
credits = @credits@
csav = @csav@
do_syslog = @do_syslog@
@@ -132,7 +132,6 @@
warnsender = @warnsender@
zoo = @zoo@
-
sbin_PROGRAMS = @AMAVIS_MILTER@
sbin_SCRIPTS = amavis
@@ -145,7 +144,6 @@
EXTRA_DIST = av mta notify
CLEANFILES = $(noinst_SCRIPTS) $(sbin_SCRIPTS)
-subdir = amavis
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
CONFIG_CLEAN_FILES = checkaccount amavis
@@ -156,36 +154,34 @@
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
-am_amavis_milter_OBJECTS = amavis-milter.o
-amavis_milter_OBJECTS = $(am_amavis_milter_OBJECTS)
+amavis_milter_OBJECTS = amavis-milter.o
amavis_milter_LDADD = $(LDADD)
amavis_milter_DEPENDENCIES =
amavis_milter_LDFLAGS =
SCRIPTS = $(noinst_SCRIPTS) $(sbin_SCRIPTS)
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CFLAGS = @CFLAGS@
+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(amavis_milter_SOURCES)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-DEP_FILES = @AMDEP@ $(DEPDIR)/amavis-milter.Po
-DIST_COMMON = Makefile.am Makefile.in amavis.in checkaccount.in depcomp
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+DIST_COMMON = Makefile.am Makefile.in amavis.in checkaccount.in
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+TAR = tar
GZIP_ENV = --best
+DEP_FILES = .deps/amavis-milter.P
SOURCES = $(amavis_milter_SOURCES)
-OBJECTS = $(am_amavis_milter_OBJECTS)
+OBJECTS = $(amavis_milter_OBJECTS)
all: all-redirect
.SUFFIXES:
-.SUFFIXES: .c .o
+.SUFFIXES: .S .c .o .s
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu amavis/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
@@ -208,20 +204,23 @@
$(mkinstalldirs) $(DESTDIR)$(sbindir)
@list='$(sbin_PROGRAMS)'; for p in $$list; do \
if test -f $$p; then \
- f="`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \
- echo " $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(sbindir)/$$f"; \
- $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(sbindir)/$$f; \
+ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
else :; fi; \
done
uninstall-sbinPROGRAMS:
@$(NORMAL_UNINSTALL)
- @list='$(sbin_PROGRAMS)'; for p in $$list; do \
- f="`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \
- echo " rm -f $(DESTDIR)$(sbindir)/$$f"; \
- rm -f $(DESTDIR)$(sbindir)/$$f; \
+ list='$(sbin_PROGRAMS)'; for p in $$list; do \
+ rm -f $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
done
+.s.o:
+ $(COMPILE) -c $<
+
+.S.o:
+ $(COMPILE) -c $<
+
mostlyclean-compile:
-rm -f *.o core *.core
@@ -240,52 +239,40 @@
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(sbindir)
@list='$(sbin_SCRIPTS)'; for p in $$list; do \
- f="`echo $$p|sed '$(transform)'`"; \
if test -f $$p; then \
- echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(sbindir)/$$f"; \
- $(INSTALL_SCRIPT) $$p $(DESTDIR)$(sbindir)/$$f; \
- elif test -f $(srcdir)/$$p; then \
- echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(sbindir)/$$f"; \
- $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(sbindir)/$$f; \
- else :; fi; \
+ echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed '$(transform)'`"; \
+ $(INSTALL_SCRIPT) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed '$(transform)'`; \
+ else if test -f $(srcdir)/$$p; then \
+ echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(sbindir)/`echo $$p|sed '$(transform)'`"; \
+ $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(sbindir)/`echo $$p|sed '$(transform)'`; \
+ else :; fi; fi; \
done
uninstall-sbinSCRIPTS:
@$(NORMAL_UNINSTALL)
- @list='$(sbin_SCRIPTS)'; for p in $$list; do \
- f="`echo $$p|sed '$(transform)'`"; \
- echo " rm -f $(DESTDIR)$(sbindir)/$$f"; \
- rm -f $(DESTDIR)$(sbindir)/$$f; \
+ list='$(sbin_SCRIPTS)'; for p in $$list; do \
+ rm -f $(DESTDIR)$(sbindir)/`echo $$p|sed '$(transform)'`; \
done
tags: TAGS
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) ' { files[$$0] = 1; } \
+ID: $(HEADERS) $(SOURCES) $(LISP)
+ list='$(SOURCES) $(HEADERS)'; \
+ unique=`for i in $$list; do echo $$i; done | \
+ awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- mkid -fID $$unique $(LISP)
+ here=`pwd` && cd $(srcdir) \
+ && mkid -f$$here/ID $$unique $(LISP)
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
tags=; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) ' { files[$$0] = 1; } \
+ list='$(SOURCES) $(HEADERS)'; \
+ unique=`for i in $$list; do echo $$i; done | \
+ awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
- || etags $(ETAGS_ARGS) $$tags $$unique $(LISP)
-
-GTAGS:
- here=`CDPATH=: && cd $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $$here
+ || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
mostlyclean-tags:
@@ -296,40 +283,58 @@
maintainer-clean-tags:
-@AMDEP@include $(DEPDIR)/amavis-milter.Po
-
-mostlyclean-depend:
-
-clean-depend:
-
-distclean-depend:
- -rm -rf $(DEPDIR)
-
-maintainer-clean-depend:
-
-@AMDEP@CCDEPMODE = @CCDEPMODE@
-
-.c.o:
-@AMDEP@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(COMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
-
-
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+subdir = amavis
+
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/Makefile
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
- cp -pR $$d/$$file $(distdir) \
- || exit 1; \
+ cp -pr $$d/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
- || exit 1; \
+ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+ || cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
+
+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
+
+-include $(DEP_FILES)
+
+mostlyclean-depend:
+
+clean-depend:
+
+distclean-depend:
+ -rm -rf .deps
+
+maintainer-clean-depend:
+
+%.o: %.c
+ @echo '$(COMPILE) -c $<'; \
+ $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+ @-cp .deps/$(*F).pp .deps/$(*F).P; \
+ tr ' ' '\012' < .deps/$(*F).pp \
+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+ >> .deps/$(*F).P; \
+ rm .deps/$(*F).pp
+
+%.lo: %.c
+ @echo '$(LTCOMPILE) -c $<'; \
+ $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
+ < .deps/$(*F).pp > .deps/$(*F).P; \
+ tr ' ' '\012' < .deps/$(*F).pp \
+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+ >> .deps/$(*F).P; \
+ rm -f .deps/$(*F).pp
info-am:
info: info-am
dvi-am:
@@ -354,7 +359,7 @@
all-am: Makefile $(PROGRAMS) $(SCRIPTS)
all-redirect: all-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
+ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
installdirs:
$(mkinstalldirs) $(DESTDIR)$(sbindir) $(DESTDIR)$(sbindir)
@@ -369,7 +374,6 @@
-rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
- -rm -f Makefile.in
mostlyclean-am: mostlyclean-sbinPROGRAMS mostlyclean-compile \
mostlyclean-tags mostlyclean-depend mostlyclean-generic
@@ -399,11 +403,11 @@
install-sbinPROGRAMS mostlyclean-compile distclean-compile \
clean-compile maintainer-clean-compile uninstall-sbinSCRIPTS \
install-sbinSCRIPTS tags mostlyclean-tags distclean-tags clean-tags \
-maintainer-clean-tags mostlyclean-depend distclean-depend clean-depend \
-maintainer-clean-depend distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
+maintainer-clean-tags distdir mostlyclean-depend distclean-depend \
+clean-depend maintainer-clean-depend 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 install-strip installdirs mostlyclean-generic \
+all-redirect all-am all installdirs mostlyclean-generic \
distclean-generic clean-generic maintainer-clean-generic clean \
mostlyclean distclean maintainer-clean
diff -Nura amavis-perl-11-orig/amavis/amavis.in amavis-perl-11/amavis/amavis.in
--- amavis-perl-11-orig/amavis/amavis.in Thu Apr 5 21:22:52 2001
+++ amavis-perl-11/amavis/amavis.in Mon Apr 22 00:38:28 2002
@@ -54,6 +54,9 @@
# H+BEDV AntiVir
my $antivir = "@antivir@";
+# Clam Antivirus
+my $clamscan = "@clamscan@";
+
# Sophos Anti Virus (sweep)
my $sophos = "@sophos@";
my $sophos_ide = "@sophos_ide@";
@@ -287,6 +290,7 @@
#
@hbedv_scanner_frag@
+@clam_scanner_frag@
@nai_scanner_frag@
@sophos_scanner_frag@
@avp_scanner_frag@
diff -Nura amavis-perl-11-orig/amavis/av/clam amavis-perl-11/amavis/av/clam
--- amavis-perl-11-orig/amavis/av/clam Thu Jan 1 01:00:00 1970
+++ amavis-perl-11/amavis/av/clam Mon Apr 22 01:06:34 2002
@@ -0,0 +1,18 @@
+#
+# Clam Antivirus
+#
+
+if ($clamscan ne "") {
+ # --one-virus is only for esthetic reasons.
+ $output = `$clamscan --stdout -r -w --one-virus $TEMPDIR/parts`;
+ $errval = ($? >> 8);
+ do_log(2,$output);
+ if ($errval != 0) {
+ if ($errval == 1) {
+ @virusname = ($output =~ /.*: (.+) FOUND/g);
+ do_virus($output);
+ } else {
+ do_log(0,"Virus scanner failure: $clamscan (error code: $errval)");
+ }
+ }
+}
diff -Nura amavis-perl-11-orig/configure amavis-perl-11/configure
--- amavis-perl-11-orig/configure Fri Apr 6 15:16:55 2001
+++ amavis-perl-11/configure Mon Apr 22 00:38:39 2002
@@ -2983,6 +2983,7 @@
avp_scanner_frag=$srcdir/amavis/av/avp
avpdc_scanner_frag=$srcdir/amavis/av/avpdc
cai_scanner_frag=$srcdir/amavis/av/cai
+ clam_scanner_frag=$srcdir/amavis/av/clam
csav_scanner_frag=$srcdir/amavis/av/csav
cyber_scanner_frag=$srcdir/amavis/av/cyber
fsec_scanner_frag=$srcdir/amavis/av/fsec
@@ -2998,13 +2999,13 @@
hbedv_scanner_frag=/dev/null
echo "checking *** H+BEDV AntiVir/X ***" 1>&6
-echo "configure:3002: checking *** H+BEDV AntiVir/X ***" >&5
+echo "configure:3003: 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:3008: checking for $ac_word" >&5
+echo "configure:3009: 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
@@ -3050,15 +3051,68 @@
hbedv_scanner_frag=$srcdir/amavis/av/hbedv
fi
+clam_scanner_frag=/dev/null
+echo "checking *** Clam Antivirus ***" 1>&6
+echo "configure:3057: checking *** Clam Antivirus ***" >&5
+for ac_prog in clamscan
+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:3063: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_clamscan'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ case "$clamscan" in
+ /*)
+ ac_cv_path_clamscan="$clamscan" # Let the user override the test with a path.
+ ;;
+ ?:/*)
+ ac_cv_path_clamscan="$clamscan" # Let the user override the test with a dos path.
+ ;;
+ *)
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+ ac_dummy="$PATH:/usr/bin:/usr/local/bin"
+ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_path_clamscan="$ac_dir/$ac_word"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
+ ;;
+esac
+fi
+clamscan="$ac_cv_path_clamscan"
+if test -n "$clamscan"; then
+ echo "$ac_t""$clamscan" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+test -n "$clamscan" && break
+done
+
+if test "x$clamscan" = "x" ; then
+ echo "configure: warning: ************************************************************" 1>&2
+ echo "configure: warning: *** Clam Antivirus NOT found ***" 1>&2
+ echo "configure: warning: *** but that's ok ***" 1>&2
+ echo "configure: warning: ************************************************************" 1>&2
+else
+ avscanner="$avscanner Clam Antivirus"
+ clam_scanner_frag=$srcdir/amavis/av/clam
+fi
+
nai_scanner_frag=/dev/null
echo "checking *** McAfee Virusscan ***" 1>&6
-echo "configure:3056: checking *** McAfee Virusscan ***" >&5
+echo "configure:3110: 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:3062: checking for $ac_word" >&5
+echo "configure:3116: 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
@@ -3102,7 +3156,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:3106: checking NAI Anti Virus (uvscan) version" >&5
+echo "configure:3160: 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
@@ -3119,11 +3173,11 @@
sophos_scanner_frag=/dev/null
echo "checking *** Sophos Sweep ***" 1>&6
-echo "configure:3123: checking *** Sophos Sweep ***" >&5
+echo "configure:3177: 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:3127: checking for $ac_word" >&5
+echo "configure:3181: 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
@@ -3162,7 +3216,7 @@
echo "configure: warning: ************************************************************" 1>&2
else
echo $ac_n "checking if $sophos really is Sophos Sweep""... $ac_c" 1>&6
-echo "configure:3166: checking if $sophos really is Sophos Sweep" >&5
+echo "configure:3220: 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
@@ -3192,7 +3246,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:3196: checking where Sophos Sweep looks for virus identities" >&5
+echo "configure:3250: checking where Sophos Sweep looks for virus identities" >&5
if test -d ${sophos_ide} ; then
echo "$ac_t""${sophos_ide}" 1>&6
else
@@ -3204,13 +3258,13 @@
avpdc_scanner_frag=/dev/null
echo "checking *** Kaspersky Anti-Virus (AVPDaemon) ***" 1>&6
-echo "configure:3208: checking *** Kaspersky Anti-Virus (AVPDaemon) ***" >&5
+echo "configure:3262: checking *** Kaspersky Anti-Virus (AVPDaemon) ***" >&5
for ac_prog in AvpDaemon
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:3214: checking for $ac_word" >&5
+echo "configure:3268: 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
@@ -3251,7 +3305,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:3255: checking for $ac_word" >&5
+echo "configure:3309: 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
@@ -3296,13 +3350,13 @@
## now check for AVP cmd line version
avp_scanner_frag=/dev/null
echo "checking *** Kaspersky Anti-Virus ***" 1>&6
-echo "configure:3300: checking *** Kaspersky Anti-Virus ***" >&5
+echo "configure:3354: checking *** Kaspersky Anti-Virus ***" >&5
for ac_prog in AvpLinux
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:3306: checking for $ac_word" >&5
+echo "configure:3360: 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
@@ -3352,13 +3406,13 @@
avscanner="$avscanner Kaspersky Anti-Virus (AVPDaemon)"
echo "checking *** Kaspersky AVPDaemonClient ***" 1>&6
-echo "configure:3356: checking *** Kaspersky AVPDaemonClient ***" >&5
+echo "configure:3410: 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:3362: checking for $ac_word" >&5
+echo "configure:3416: 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
@@ -3401,13 +3455,13 @@
echo "checking *** Kaspersky AVPDaemonTst ***" 1>&6
-echo "configure:3405: checking *** Kaspersky AVPDaemonTst ***" >&5
+echo "configure:3459: 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:3411: checking for $ac_word" >&5
+echo "configure:3465: 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
@@ -3461,13 +3515,13 @@
fsec_scanner_frag=/dev/null
echo "checking *** DataFellows F-Secure AntiVirus ***" 1>&6
-echo "configure:3465: checking *** DataFellows F-Secure AntiVirus ***" >&5
+echo "configure:3519: 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:3471: checking for $ac_word" >&5
+echo "configure:3525: 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
@@ -3514,13 +3568,13 @@
trend_scanner_frag=/dev/null
echo "checking *** Trend Micro FileScanner ***" 1>&6
-echo "configure:3518: checking *** Trend Micro FileScanner ***" >&5
+echo "configure:3572: 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:3524: checking for $ac_word" >&5
+echo "configure:3578: 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
@@ -3567,13 +3621,13 @@
cyber_scanner_frag=/dev/null
echo "checking *** CyberSoft vfind ***" 1>&6
-echo "configure:3571: checking *** CyberSoft vfind ***" >&5
+echo "configure:3625: 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:3577: checking for $ac_word" >&5
+echo "configure:3631: 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
@@ -3620,13 +3674,13 @@
cai_scanner_frag=/dev/null
echo "checking *** CAI InoculateIT Inocucmd command line utility 4.0 ***" 1>&6
-echo "configure:3624: checking *** CAI InoculateIT Inocucmd command line utility 4.0 ***" >&5
+echo "configure:3678: 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:3630: checking for $ac_word" >&5
+echo "configure:3684: 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
@@ -3673,13 +3727,13 @@
rav_scanner_frag=/dev/null
echo "checking *** GeCAD RAV AntiVirus 8 ***" 1>&6
-echo "configure:3677: checking *** GeCAD RAV AntiVirus 8 ***" >&5
+echo "configure:3731: 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:3683: checking for $ac_word" >&5
+echo "configure:3737: 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
@@ -3726,13 +3780,13 @@
nod32_scanner_frag=/dev/null
echo "checking *** ESOFT NOD32 ***" 1>&6
-echo "configure:3730: checking *** ESOFT NOD32 ***" >&5
+echo "configure:3784: 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:3736: checking for $ac_word" >&5
+echo "configure:3790: 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
@@ -3779,11 +3833,11 @@
csav_scanner_frag=/dev/null
echo "checking *** Command AntiVirus for Linux ***" 1>&6
-echo "configure:3783: checking *** Command AntiVirus for Linux ***" >&5
+echo "configure:3837: 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:3787: checking for $ac_word" >&5
+echo "configure:3841: 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
@@ -3826,8 +3880,8 @@
fi
echo $ac_n "checking if any virus scanners are installed at all""... $ac_c" 1>&6
-echo "configure:3830: 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" = "x" ; then
+echo "configure:3884: checking if any virus scanners are installed at all" >&5
+if test "x$antivir$clamscan$uvscan$ufindvir$fvsco$sophos$avp$avpdc$fsav$vscan$vfind$inocucmd$rav$nod32$csav" = "x" ; then
echo "$ac_t""no" 1>&6
{ echo "configure: error:
@@ -3845,7 +3899,7 @@
runtime_dir=/var/amavis
echo $ac_n "checking for runtime directory""... $ac_c" 1>&6
-echo "configure:3849: checking for runtime directory" >&5
+echo "configure:3903: 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"
@@ -3860,7 +3914,7 @@
echo $ac_n "checking whether to use syslog""... $ac_c" 1>&6
-echo "configure:3864: checking whether to use syslog" >&5
+echo "configure:3918: 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"
@@ -3883,7 +3937,7 @@
if test "$do_syslog" = "yes" ; then
echo $ac_n "checking syslog facility.level""... $ac_c" 1>&6
-echo "configure:3887: checking syslog facility.level" >&5
+echo "configure:3941: 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"
@@ -3894,7 +3948,7 @@
else
echo $ac_n "checking directory for logfile(s)""... $ac_c" 1>&6
-echo "configure:3898: checking directory for logfile(s)" >&5
+echo "configure:3952: 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"
@@ -3906,7 +3960,7 @@
echo $ac_n "checking user id amavis runs under""... $ac_c" 1>&6
-echo "configure:3910: checking user id amavis runs under" >&5
+echo "configure:3964: checking user id amavis runs under" >&5
# Check whether --with-amavisuser or --without-amavisuser was given.
if test "${with_amavisuser+set}" = set; then
withval="$with_amavisuser"
@@ -3930,7 +3984,7 @@
echo $ac_n "checking whether to keep a backup of infected mails""... $ac_c" 1>&6
-echo "configure:3934: checking whether to keep a backup of infected mails" >&5
+echo "configure:3988: checking whether to keep a backup of infected mails" >&5
# Check whether --enable-virusbackup or --disable-virusbackup was given.
if test "${enable_virusbackup+set}" = set; then
enableval="$enable_virusbackup"
@@ -3944,7 +3998,7 @@
echo $ac_n "checking directory to move infected mails to""... $ac_c" 1>&6
-echo "configure:3948: checking directory to move infected mails to" >&5
+echo "configure:4002: checking directory to move infected mails to" >&5
# Check whether --with-virusdir or --without-virusdir was given.
if test "${with_virusdir+set}" = set; then
withval="$with_virusdir"
@@ -3958,7 +4012,7 @@
echo $ac_n "checking maximum depth of recursive unpacking (maxlevel)""... $ac_c" 1>&6
-echo "configure:3962: checking maximum depth of recursive unpacking (maxlevel)" >&5
+echo "configure:4016: checking maximum depth of recursive unpacking (maxlevel)" >&5
# Check whether --with-maxlevel or --without-maxlevel was given.
if test "${with_maxlevel+set}" = set; then
withval="$with_maxlevel"
@@ -3972,7 +4026,7 @@
echo $ac_n "checking send notification to sender""... $ac_c" 1>&6
-echo "configure:3976: checking send notification to sender" >&5
+echo "configure:4030: 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"
@@ -3994,7 +4048,7 @@
echo $ac_n "checking send notification to recipient(s)""... $ac_c" 1>&6
-echo "configure:3998: checking send notification to recipient(s)" >&5
+echo "configure:4052: 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"
@@ -4016,7 +4070,7 @@
echo $ac_n "checking send notification to admin""... $ac_c" 1>&6
-echo "configure:4020: checking send notification to admin" >&5
+echo "configure:4074: checking send notification to admin" >&5
# Check whether --with-warnadmin or --without-warnadmin was given.
if test "${with_warnadmin+set}" = set; then
withval="$with_warnadmin"
@@ -4038,7 +4092,7 @@
echo $ac_n "checking from address in reports""... $ac_c" 1>&6
-echo "configure:4042: checking from address in reports" >&5
+echo "configure:4096: checking from address in reports" >&5
# Check whether --with-mailfrom or --without-mailfrom was given.
if test "${with_mailfrom+set}" = set; then
withval="$with_mailfrom"
@@ -4052,7 +4106,7 @@
echo $ac_n "checking user to mail reports to""... $ac_c" 1>&6
-echo "configure:4056: checking user to mail reports to" >&5
+echo "configure:4110: checking user to mail reports to" >&5
# Check whether --with-mailto or --without-mailto was given.
if test "${with_mailto+set}" = set; then
withval="$with_mailto"
@@ -4066,7 +4120,7 @@
echo $ac_n "checking whether to display AMaVis credits to users""... $ac_c" 1>&6
-echo "configure:4070: checking whether to display AMaVis credits to users" >&5
+echo "configure:4124: checking whether to display AMaVis credits to users" >&5
# Check whether --enable-credits or --disable-credits was given.
if test "${enable_credits+set}" = set; then
@@ -4081,7 +4135,7 @@
echo $ac_n "checking header rewrite""... $ac_c" 1>&6
-echo "configure:4085: checking header rewrite" >&5
+echo "configure:4139: checking header rewrite" >&5
# Check whether --enable-x_header or --disable-x_header was given.
if test "${enable_x_header+set}" = set; then
enableval="$enable_x_header"
@@ -4107,6 +4161,7 @@
+
trap '' 1 2 15
cat > confcache <<\EOF
# This file is a shell script that caches the results of configure
@@ -4305,6 +4360,7 @@
/@mta_send_frag@/r $mta_send_frag
s%@mta_send_frag@%%g
s%@antivir@%$antivir%g
+s%@clamscan@%$clamscan%g
s%@uvscan@%$uvscan%g
s%@uvscan_args@%$uvscan_args%g
s%@uvscan_exitcode@%$uvscan_exitcode%g
@@ -4347,6 +4403,8 @@
s%@avpdc_scanner_frag@%%g
/@cai_scanner_frag@/r $cai_scanner_frag
s%@cai_scanner_frag@%%g
+/@clam_scanner_frag@/r $clam_scanner_frag
+s%@clam_scanner_frag@%%g
/@csav_scanner_frag@/r $csav_scanner_frag
s%@csav_scanner_frag@%%g
/@cyber_scanner_frag@/r $cyber_scanner_frag
diff -Nura amavis-perl-11-orig/configure.in amavis-perl-11/configure.in
--- amavis-perl-11-orig/configure.in Fri Apr 6 15:15:41 2001
+++ amavis-perl-11/configure.in Sun Apr 21 23:31:00 2002
@@ -348,6 +348,7 @@
avp_scanner_frag=$srcdir/amavis/av/avp
avpdc_scanner_frag=$srcdir/amavis/av/avpdc
cai_scanner_frag=$srcdir/amavis/av/cai
+ clam_scanner_frag=$srcdir/amavis/av/clam
csav_scanner_frag=$srcdir/amavis/av/csav
cyber_scanner_frag=$srcdir/amavis/av/cyber
fsec_scanner_frag=$srcdir/amavis/av/fsec
@@ -375,6 +376,19 @@
hbedv_scanner_frag=$srcdir/amavis/av/hbedv
fi
+clam_scanner_frag=/dev/null
+AC_CHECKING([*** Clam Antivirus ***])
+AC_PATH_PROGS(clamscan, clamscan, , $PATH:/usr/bin:/usr/local/bin)
+if test "x$clamscan" = "x" ; then
+ AC_MSG_WARN([************************************************************])
+ AC_MSG_WARN([*** Clam Antivirus NOT found ***])
+ AC_MSG_WARN([*** but that's ok ***])
+ AC_MSG_WARN([************************************************************])
+else
+ avscanner="$avscanner Clam Antivirus"
+ clam_scanner_frag=$srcdir/amavis/av/clam
+fi
+
nai_scanner_frag=/dev/null
AC_CHECKING([*** McAfee Virusscan ***])
AC_PATH_PROGS(uvscan, uvscan, , $PATH:/usr/bin:/usr/local/bin)
@@ -602,7 +616,7 @@
fi
AC_MSG_CHECKING([if any virus scanners are installed at all])
-if test "x$antivir$uvscan$ufindvir$fvsco$sophos$avp$avpdc$fsav$vscan$vfind$inocucmd$rav$nod32$csav" = "x" ; then
+if test "x$antivir$clamscan$uvscan$ufindvir$fvsco$sophos$avp$avpdc$fsav$vscan$vfind$inocucmd$rav$nod32$csav" = "x" ; then
AC_MSG_RESULT([no])
AC_MSG_ERROR([
@@ -818,6 +832,7 @@
AC_SUBST_FILE(avp_scanner_frag)
AC_SUBST_FILE(avpdc_scanner_frag)
AC_SUBST_FILE(cai_scanner_frag)
+AC_SUBST_FILE(clam_scanner_frag)
AC_SUBST_FILE(csav_scanner_frag)
AC_SUBST_FILE(cyber_scanner_frag)
AC_SUBST_FILE(fsec_scanner_frag)
diff -Nura amavis-perl-11-orig/tests/Makefile.in amavis-perl-11/tests/Makefile.in
--- amavis-perl-11-orig/tests/Makefile.in Fri Apr 6 15:17:14 2001
+++ amavis-perl-11/tests/Makefile.in Mon Apr 22 00:33:30 2002
@@ -1,7 +1,6 @@
-# Makefile.in generated automatically by automake 1.4c from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 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.
@@ -11,6 +10,7 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
+
SHELL = @SHELL@
srcdir = @srcdir@
@@ -32,6 +32,8 @@
includedir = @includedir@
oldincludedir = /usr/include
+DESTDIR =
+
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
@@ -44,10 +46,9 @@
AUTOHEADER = @AUTOHEADER@
INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
transform = @program_transform_name@
NORMAL_INSTALL = :
@@ -56,8 +57,6 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-
-@SET_MAKE@
host_alias = @host_alias@
host_triplet = @host@
AMAVIS_MILTER = @AMAVIS_MILTER@
@@ -87,6 +86,7 @@
avpd = @avpd@
avpdc = @avpdc@
bunzip2 = @bunzip2@
+clamscan = @clamscan@
credits = @credits@
csav = @csav@
do_syslog = @do_syslog@
@@ -132,7 +132,6 @@
warnsender = @warnsender@
zoo = @zoo@
-
TESTS = config novirus-msg virus-msg xheader
EXTRA_DIST = $(TESTS) test-setup
@@ -140,100 +139,76 @@
noinst_SCRIPTS = amavis-test
CLEANFILES = $(noinst_SCRIPTS) EICAR.COM amavis.log debug
-subdir = tests
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
CONFIG_CLEAN_FILES =
SCRIPTS = $(noinst_SCRIPTS)
-DIST_SOURCES =
DIST_COMMON = README Makefile.am Makefile.in
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+TAR = tar
GZIP_ENV = --best
all: all-redirect
.SUFFIXES:
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
tags: TAGS
TAGS:
-check-TESTS: $(TESTS)
- @failed=0; all=0; xfail=0; xpass=0; \
- srcdir=$(srcdir); export srcdir; \
- list='$(TESTS)'; \
- if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
- elif test -f $$tst; then dir=; \
- else dir="$(srcdir)/"; fi; \
- if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
- *" $$tst "*) \
- xpass=`expr $$xpass + 1`; \
- failed=`expr $$failed + 1`; \
- echo "XPASS: $$tst"; \
- ;; \
- *) \
- echo "PASS: $$tst"; \
- ;; \
- esac; \
- elif test $$? -ne 77; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
- *" $$tst "*) \
- xfail=`expr $$xfail + 1`; \
- echo "XFAIL: $$tst"; \
- ;; \
- *) \
- failed=`expr $$failed + 1`; \
- echo "FAIL: $$tst"; \
- ;; \
- esac; \
- fi; \
- done; \
- if test "$$failed" -eq 0; then \
- if test "$$xfail" -eq 0; then \
- banner="All $$all tests passed"; \
- else \
- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
- fi; \
- else \
- if test "$$xpass" -eq 0; then \
- banner="$$failed of $$all tests failed"; \
- else \
- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
- fi; \
- fi; \
- dashes=`echo "$$banner" | sed s/./=/g`; \
- echo "$$dashes"; \
- echo "$$banner"; \
- echo "$$dashes"; \
- test "$$failed" -eq 0; \
- fi
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+subdir = tests
+
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 tests/Makefile
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
- cp -pR $$d/$$file $(distdir) \
- || exit 1; \
+ cp -pr $$d/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
- || exit 1; \
+ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+ || cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
+check-TESTS: $(TESTS)
+ @failed=0; all=0; \
+ srcdir=$(srcdir); export srcdir; \
+ for tst in $(TESTS); do \
+ if test -f $$tst; then dir=.; \
+ else dir="$(srcdir)"; fi; \
+ if $(TESTS_ENVIRONMENT) $$dir/$$tst; then \
+ all=`expr $$all + 1`; \
+ echo "PASS: $$tst"; \
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "FAIL: $$tst"; \
+ fi; \
+ done; \
+ if test "$$failed" -eq 0; then \
+ banner="All $$all tests passed"; \
+ else \
+ banner="$$failed of $$all tests failed"; \
+ fi; \
+ dashes=`echo "$$banner" | sed s/./=/g`; \
+ echo "$$dashes"; \
+ echo "$$banner"; \
+ echo "$$dashes"; \
+ test "$$failed" -eq 0
info-am:
info: info-am
dvi-am:
@@ -257,7 +232,7 @@
all-am: Makefile $(SCRIPTS)
all-redirect: all-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
+ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
installdirs:
@@ -271,7 +246,6 @@
-rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
- -rm -f Makefile.in
mostlyclean-am: mostlyclean-generic
mostlyclean: mostlyclean-am
@@ -290,10 +264,10 @@
maintainer-clean: maintainer-clean-am
-.PHONY: tags check-TESTS distdir info-am info dvi-am dvi check check-am \
+.PHONY: tags distdir check-TESTS 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 install-strip installdirs mostlyclean-generic \
+all-redirect all-am all installdirs mostlyclean-generic \
distclean-generic clean-generic maintainer-clean-generic clean \
mostlyclean distclean maintainer-clean
