@@ -1,3 +1,8 @@

+Mon Feb  4 23:06:34 EET 2008 (edwin)

+---------------------------------

+  * libclamav/textnorm.[ch]: generic text normalizer (bb #241)

+  * configure, aclocal.m4, */Makefile.in: automake complained that they were too old

+

 Mon Feb  4 18:24:14 CET 2008 (tk)

 ---------------------------------

   * libclamav: fix some compiler warnings

@@ -1,8 +1,8 @@

-# Makefile.in generated by automake 1.10 from Makefile.am.

+# Makefile.in generated by automake 1.10.1 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.

+# 2003, 2004, 2005, 2006, 2007, 2008  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.

@@ -447,8 +447,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(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; } \

-	       END { for (i in files) print i; }'`; \

+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \

+	      END { if (nonempty) { for (i in files) print i; }; }'`; \

 	mkid -fID $$unique

 tags: TAGS

@@ -473,8 +473,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) clamav-config.h.in $(TAGS_DEPENDENCIE

 	unique=`for i in $$list; do \

 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \

 	  done | \

-	  $(AWK) '    { files[$$0] = 1; } \

-	       END { for (i in files) print i; }'`; \

+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \

+	      END { if (nonempty) { for (i in files) print i; }; }'`; \

 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \

 	  test -n "$$unique" || unique=$$empty_fix; \

 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

@@ -484,13 +484,12 @@ ctags: CTAGS

 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) clamav-config.h.in $(TAGS_DEPENDENCIES) \

 		$(TAGS_FILES) $(LISP)

 	tags=; \

-	here=`pwd`; \

 	list='$(SOURCES) $(HEADERS) clamav-config.h.in $(LISP) $(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; } \

-	       END { for (i in files) print i; }'`; \

+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \

+	      END { if (nonempty) { for (i in files) print i; }; }'`; \

 	test -z "$(CTAGS_ARGS)$$tags$$unique" \

 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \

 	     $$tags $$unique

@@ -560,6 +559,10 @@ dist-bzip2: distdir

 	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2

 	$(am__remove_distdir)

+dist-lzma: distdir

+	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma

+	$(am__remove_distdir)

+

 dist-tarZ: distdir

 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z

 	$(am__remove_distdir)

@@ -587,6 +590,8 @@ distcheck: dist

 	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\

 	*.tar.bz2*) \

 	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\

+	*.tar.lzma*) \

+	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\

 	*.tar.Z*) \

 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\

 	*.shar.gz*) \

@@ -741,8 +746,8 @@ uninstall-am: uninstall-binSCRIPTS uninstall-pkgconfigDATA

 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \

 	all all-am am--refresh check check-am clean clean-generic \

 	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \

-	dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \

-	distclean-generic distclean-hdr distclean-libtool \

+	dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \

+	distclean distclean-generic distclean-hdr distclean-libtool \

 	distclean-tags distcleancheck distdir distuninstallcheck dvi \

 	dvi-am html html-am info info-am install install-am \

 	install-binSCRIPTS install-data install-data-am install-dvi \

@@ -1,7 +1,7 @@

-# generated automatically by aclocal 1.10 -*- Autoconf -*-

+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-

 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,

-# 2005, 2006  Free Software Foundation, Inc.

+# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.

 # This file 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,10 +11,13 @@

 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A

 # PARTICULAR PURPOSE.

-m4_if(m4_PACKAGE_VERSION, [2.61],,

-[m4_fatal([this file was generated for autoconf 2.61.

-You have another version of autoconf.  If you want to use that,

-you should regenerate the build system entirely.], [63])])

+m4_ifndef([AC_AUTOCONF_VERSION],

+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl

+m4_if(AC_AUTOCONF_VERSION, [2.61],,

+[m4_warning([this file was generated for autoconf 2.61.

+You have another version of autoconf.  It may work, but is not guaranteed to.

+If you have problems, you may need to regenerate the build system entirely.

+To do so, use the procedure documented by the package, typically `autoreconf'.])])

 # lib-ld.m4 serial 3 (gettext-0.13)

 dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.

@@ -6708,7 +6711,7 @@ AC_SUBST([SED])

 AC_MSG_RESULT([$SED])

 ])

-# Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.

+# Copyright (C) 2002, 2003, 2005, 2006, 2007  Free Software Foundation, Inc.

 #

 # This file is free software; the Free Software Foundation

 # gives unlimited permission to copy and/or distribute it,

@@ -6723,7 +6726,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],

 [am__api_version='1.10'

 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to

 dnl require some minimum version.  Point them to the right macro.

-m4_if([$1], [1.10], [],

+m4_if([$1], [1.10.1], [],

       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl

 ])

@@ -6739,8 +6742,10 @@ m4_define([_AM_AUTOCONF_VERSION], [])

 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.

 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.

 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],

-[AM_AUTOMAKE_VERSION([1.10])dnl

-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])

+[AM_AUTOMAKE_VERSION([1.10.1])dnl

+m4_ifndef([AC_AUTOCONF_VERSION],

+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl

+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])

 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-

@@ -7012,7 +7017,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],

   # each Makefile.in and add a new line on top of each file to say so.

   # Grep'ing the whole file is not good either: AIX grep has a line

   # limit of 2048, but all sed's we know have understand at least 4000.

-  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then

+  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then

     dirpart=`AS_DIRNAME("$mf")`

   else

     continue

@@ -7060,13 +7065,13 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],

 # Do all the work for Automake.                             -*- Autoconf -*-

 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,

-# 2005, 2006 Free Software Foundation, Inc.

+# 2005, 2006, 2008 Free Software Foundation, Inc.

 #

 # This file 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.

-# serial 12

+# serial 13

 # This macro actually does too much.  Some checks are only needed if

 # your package does certain things.  But this isn't really a big deal.

@@ -7171,16 +7176,17 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJC],

 # our stamp files there.

 AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],

 [# Compute $1's index in $config_headers.

+_am_arg=$1

 _am_stamp_count=1

 for _am_header in $config_headers :; do

   case $_am_header in

-    $1 | $1:* )

+    $_am_arg | $_am_arg:* )

       break ;;

     * )

       _am_stamp_count=`expr $_am_stamp_count + 1` ;;

   esac

 done

-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])

+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])

 # Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.

 #

@@ -7452,7 +7458,7 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])

 # _AM_SUBST_NOTMAKE(VARIABLE)

 # ---------------------------

-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.

+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.

 # This macro is traced by Automake.

 AC_DEFUN([_AM_SUBST_NOTMAKE])

@@ -1,8 +1,8 @@

-# Makefile.in generated by automake 1.10 from Makefile.am.

+# Makefile.in generated by automake 1.10.1 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.

+# 2003, 2004, 2005, 2006, 2007, 2008  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.

@@ -82,7 +82,7 @@ am__clamav_milter_SOURCES_DIST = $(top_srcdir)/shared/cfgparser.c \

 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@	clamav-milter.$(OBJEXT)

 clamav_milter_OBJECTS = $(am_clamav_milter_OBJECTS)

 clamav_milter_LDADD = $(LDADD)

-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@

+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)

 depcomp = $(SHELL) $(top_srcdir)/config/depcomp

 am__depfiles_maybe = depfiles

 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \

@@ -284,8 +284,8 @@ install-sbinPROGRAMS: $(sbin_PROGRAMS)

 	     || test -f $$p1 \

 	  ; then \

 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \

-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \

-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \

+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \

+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \

 	  else :; fi; \

 	done

@@ -467,8 +467,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(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; } \

-	       END { for (i in files) print i; }'`; \

+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \

+	      END { if (nonempty) { for (i in files) print i; }; }'`; \

 	mkid -fID $$unique

 tags: TAGS

@@ -480,8 +480,8 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \

 	unique=`for i in $$list; do \

 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \

 	  done | \

-	  $(AWK) '    { files[$$0] = 1; } \

-	       END { for (i in files) print i; }'`; \

+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \

+	      END { if (nonempty) { for (i in files) print i; }; }'`; \

 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \

 	  test -n "$$unique" || unique=$$empty_fix; \

 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

@@ -491,13 +491,12 @@ ctags: CTAGS

 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \

 		$(TAGS_FILES) $(LISP)

 	tags=; \

-	here=`pwd`; \

 	list='$(SOURCES) $(HEADERS)  $(LISP) $(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; } \

-	       END { for (i in files) print i; }'`; \

+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \

+	      END { if (nonempty) { for (i in files) print i; }; }'`; \

 	test -z "$(CTAGS_ARGS)$$tags$$unique" \

 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \

 	     $$tags $$unique

@@ -1,8 +1,8 @@

-# Makefile.in generated by automake 1.10 from Makefile.am.

+# Makefile.in generated by automake 1.10.1 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.

+# 2003, 2004, 2005, 2006, 2007, 2008  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.

@@ -70,7 +70,7 @@ am_clamconf_OBJECTS = cfgparser.$(OBJEXT) misc.$(OBJEXT) \

 	getopt.$(OBJEXT) clamconf.$(OBJEXT)

 clamconf_OBJECTS = $(am_clamconf_OBJECTS)

 clamconf_LDADD = $(LDADD)

-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@

+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)

 depcomp = $(SHELL) $(top_srcdir)/config/depcomp

 am__depfiles_maybe = depfiles

 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \

@@ -263,8 +263,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)

 	     || test -f $$p1 \

 	  ; then \

 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \

-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \

-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \

+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \

+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \

 	  else :; fi; \

 	done

@@ -371,8 +371,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(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; } \

-	       END { for (i in files) print i; }'`; \

+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \

+	      END { if (nonempty) { for (i in files) print i; }; }'`; \

 	mkid -fID $$unique

 tags: TAGS

@@ -384,8 +384,8 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \

 	unique=`for i in $$list; do \

 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \

 	  done | \

-	  $(AWK) '    { files[$$0] = 1; } \

-	       END { for (i in files) print i; }'`; \

+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \

+	      END { if (nonempty) { for (i in files) print i; }; }'`; \

 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \

 	  test -n "$$unique" || unique=$$empty_fix; \

 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

@@ -395,13 +395,12 @@ ctags: CTAGS

 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \

 		$(TAGS_FILES) $(LISP)

 	tags=; \

-	here=`pwd`; \

 	list='$(SOURCES) $(HEADERS)  $(LISP) $(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; } \

-	       END { for (i in files) print i; }'`; \

+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \

+	      END { if (nonempty) { for (i in files) print i; }; }'`; \

 	test -z "$(CTAGS_ARGS)$$tags$$unique" \

 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \

 	     $$tags $$unique

@@ -1,8 +1,8 @@

-# Makefile.in generated by automake 1.10 from Makefile.am.

+# Makefile.in generated by automake 1.10.1 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.

+# 2003, 2004, 2005, 2006, 2007, 2008  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.

@@ -90,7 +90,7 @@ am__clamd_SOURCES_DIST = $(top_srcdir)/shared/output.c \

 @BUILD_CLAMD_TRUE@	dazukoio.$(OBJEXT)

 clamd_OBJECTS = $(am_clamd_OBJECTS)

 clamd_LDADD = $(LDADD)

-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@

+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)

 depcomp = $(SHELL) $(top_srcdir)/config/depcomp

 am__depfiles_maybe = depfiles

 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \

@@ -312,8 +312,8 @@ install-sbinPROGRAMS: $(sbin_PROGRAMS)

 	     || test -f $$p1 \

 	  ; then \

 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \

-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \

-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \

+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \

+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \

 	  else :; fi; \

 	done

@@ -475,8 +475,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(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; } \

-	       END { for (i in files) print i; }'`; \

+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \

+	      END { if (nonempty) { for (i in files) print i; }; }'`; \

 	mkid -fID $$unique

 tags: TAGS

@@ -488,8 +488,8 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \

 	unique=`for i in $$list; do \

 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \

 	  done | \

-	  $(AWK) '    { files[$$0] = 1; } \

-	       END { for (i in files) print i; }'`; \

+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \

+	      END { if (nonempty) { for (i in files) print i; }; }'`; \

 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \

 	  test -n "$$unique" || unique=$$empty_fix; \

 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

@@ -499,13 +499,12 @@ ctags: CTAGS

 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \

 		$(TAGS_FILES) $(LISP)

 	tags=; \

-	here=`pwd`; \

 	list='$(SOURCES) $(HEADERS)  $(LISP) $(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; } \

-	       END { for (i in files) print i; }'`; \

+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \

+	      END { if (nonempty) { for (i in files) print i; }; }'`; \

 	test -z "$(CTAGS_ARGS)$$tags$$unique" \

 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \

 	     $$tags $$unique

@@ -1,8 +1,8 @@

-# Makefile.in generated by automake 1.10 from Makefile.am.

+# Makefile.in generated by automake 1.10.1 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.

+# 2003, 2004, 2005, 2006, 2007, 2008  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.

@@ -79,7 +79,7 @@ am__clamdscan_SOURCES_DIST = $(top_srcdir)/shared/output.c \

 @BUILD_CLAMD_TRUE@	clamdscan.$(OBJEXT) client.$(OBJEXT)

 clamdscan_OBJECTS = $(am_clamdscan_OBJECTS)

 clamdscan_LDADD = $(LDADD)

-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@

+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)

 depcomp = $(SHELL) $(top_srcdir)/config/depcomp

 am__depfiles_maybe = depfiles

 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \

@@ -279,8 +279,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)

 	     || test -f $$p1 \

 	  ; then \

 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \

-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \

-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \

+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \

+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \

 	  else :; fi; \

 	done

@@ -418,8 +418,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(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; } \

-	       END { for (i in files) print i; }'`; \

+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \

+	      END { if (nonempty) { for (i in files) print i; }; }'`; \

 	mkid -fID $$unique

 tags: TAGS

@@ -431,8 +431,8 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \

 	unique=`for i in $$list; do \

 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \

 	  done | \

-	  $(AWK) '    { files[$$0] = 1; } \

-	       END { for (i in files) print i; }'`; \

+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \

+	      END { if (nonempty) { for (i in files) print i; }; }'`; \

 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \

 	  test -n "$$unique" || unique=$$empty_fix; \

 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

@@ -442,13 +442,12 @@ ctags: CTAGS

 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \

 		$(TAGS_FILES) $(LISP)

 	tags=; \

-	here=`pwd`; \

 	list='$(SOURCES) $(HEADERS)  $(LISP) $(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; } \

-	       END { for (i in files) print i; }'`; \

+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \

+	      END { if (nonempty) { for (i in files) print i; }; }'`; \

 	test -z "$(CTAGS_ARGS)$$tags$$unique" \

 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \

 	     $$tags $$unique

@@ -1,8 +1,8 @@

-# Makefile.in generated by automake 1.10 from Makefile.am.

+# Makefile.in generated by automake 1.10.1 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.

+# 2003, 2004, 2005, 2006, 2007, 2008  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.

@@ -73,7 +73,7 @@ am_clamscan_OBJECTS = output.$(OBJEXT) getopt.$(OBJEXT) \

 	treewalk.$(OBJEXT)

 clamscan_OBJECTS = $(am_clamscan_OBJECTS)

 clamscan_LDADD = $(LDADD)

-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@

+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)

 depcomp = $(SHELL) $(top_srcdir)/config/depcomp

 am__depfiles_maybe = depfiles

 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \

@@ -278,8 +278,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)

 	     || test -f $$p1 \

 	  ; then \

 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \

-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \

-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \

+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \

+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \

 	  else :; fi; \

 	done

@@ -419,8 +419,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(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; } \

-	       END { for (i in files) print i; }'`; \

+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \

+	      END { if (nonempty) { for (i in files) print i; }; }'`; \

 	mkid -fID $$unique

 tags: TAGS

@@ -432,8 +432,8 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \

 	unique=`for i in $$list; do \

 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \

 	  done | \

-	  $(AWK) '    { files[$$0] = 1; } \

-	       END { for (i in files) print i; }'`; \

+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \

+	      END { if (nonempty) { for (i in files) print i; }; }'`; \

 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \

 	  test -n "$$unique" || unique=$$empty_fix; \

 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

@@ -443,13 +443,12 @@ ctags: CTAGS

 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \

 		$(TAGS_FILES) $(LISP)

 	tags=; \

-	here=`pwd`; \

 	list='$(SOURCES) $(HEADERS)  $(LISP) $(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; } \

-	       END { for (i in files) print i; }'`; \

+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \

+	      END { if (nonempty) { for (i in files) print i; }; }'`; \

 	test -z "$(CTAGS_ARGS)$$tags$$unique" \

 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \

 	     $$tags $$unique

@@ -1,9 +1,9 @@

 #! /bin/sh

 # depcomp - compile a program generating dependencies as side-effects

-scriptversion=2006-10-15.18

+scriptversion=2007-03-29.01

-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software

+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software

 # Foundation, Inc.

 # This program is free software; you can redistribute it and/or modify

@@ -215,34 +215,39 @@ aix)

   # current directory.  Also, the AIX compiler puts `$object:' at the

   # start of each line; $object doesn't have directory information.

   # Version 6 uses the directory in both cases.

-  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`

-  tmpdepfile="$stripped.u"

+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`

+  test "x$dir" = "x$object" && dir=

+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`

   if test "$libtool" = yes; then

+    tmpdepfile1=$dir$base.u

+    tmpdepfile2=$base.u

+    tmpdepfile3=$dir.libs/$base.u

     "$@" -Wc,-M

   else

+    tmpdepfile1=$dir$base.u

+    tmpdepfile2=$dir$base.u

+    tmpdepfile3=$dir$base.u

     "$@" -M

   fi

   stat=$?

-  if test -f "$tmpdepfile"; then :

-  else

-    stripped=`echo "$stripped" | sed 's,^.*/,,'`

-    tmpdepfile="$stripped.u"

-  fi

-

   if test $stat -eq 0; then :

   else

-    rm -f "$tmpdepfile"

+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"

     exit $stat

   fi

+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"

+  do

+    test -f "$tmpdepfile" && break

+  done

   if test -f "$tmpdepfile"; then

-    outname="$stripped.o"

     # Each line is of the form `foo.o: dependent.h'.

     # Do two passes, one to just change these to

     # `$object: dependent.h' and one to simply `dependent.h:'.

-    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"

-    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"

+    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"

+    # That's a tab and a space in the [].

+    sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"

   else

     # The sourcefile does not contain any dependencies, so just

     # store a dummy comment line, to avoid errors with the Makefile

@@ -1,7 +1,7 @@

 #!/bin/sh

 # install - install a program, script, or datafile

-scriptversion=2006-10-14.15

+scriptversion=2006-12-25.00

 # This originates from X11R5 (mit/util/scripts/install.sh), which was

 # later released in X11R6 (xc/config/util/install.sh) with the

@@ -48,7 +48,7 @@ IFS=" ""	$nl"

 # set DOITPROG to echo to test this script

 # Don't use :- since 4.3BSD and earlier shells don't like it.

-doit="${DOITPROG-}"

+doit=${DOITPROG-}

 if test -z "$doit"; then

   doit_exec=exec

 else

@@ -58,34 +58,49 @@ fi

 # Put in absolute file names if you don't have them in your path;

 # or use environment vars.

-mvprog="${MVPROG-mv}"

-cpprog="${CPPROG-cp}"

-chmodprog="${CHMODPROG-chmod}"

-chownprog="${CHOWNPROG-chown}"

-chgrpprog="${CHGRPPROG-chgrp}"

-stripprog="${STRIPPROG-strip}"

-rmprog="${RMPROG-rm}"

-mkdirprog="${MKDIRPROG-mkdir}"

+chgrpprog=${CHGRPPROG-chgrp}

+chmodprog=${CHMODPROG-chmod}

+chownprog=${CHOWNPROG-chown}

+cmpprog=${CMPPROG-cmp}

+cpprog=${CPPROG-cp}

+mkdirprog=${MKDIRPROG-mkdir}

+mvprog=${MVPROG-mv}

+rmprog=${RMPROG-rm}

+stripprog=${STRIPPROG-strip}

+

+posix_glob='?'

+initialize_posix_glob='

+  test "$posix_glob" != "?" || {

+    if (set -f) 2>/dev/null; then

+      posix_glob=

+    else

+      posix_glob=:

+    fi

+  }

+'

-posix_glob=

 posix_mkdir=

 # Desired mode of installed file.

 mode=0755

+chgrpcmd=

 chmodcmd=$chmodprog

 chowncmd=

-chgrpcmd=

-stripcmd=

+mvcmd=$mvprog

 rmcmd="$rmprog -f"

-mvcmd="$mvprog"

+stripcmd=

+

 src=

 dst=

 dir_arg=

-dstarg=

+dst_arg=

+

+copy_on_change=false

 no_target_directory=

-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE

+usage="\

+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE

    or: $0 [OPTION]... SRCFILES... DIRECTORY

    or: $0 [OPTION]... -t DIRECTORY SRCFILES...

    or: $0 [OPTION]... -d DIRECTORIES...

@@ -95,65 +110,55 @@ In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.

 In the 4th, create DIRECTORIES.

 Options:

--c         (ignored)

--d         create directories instead of installing files.

--g GROUP   $chgrpprog installed files to GROUP.

--m MODE    $chmodprog installed files to MODE.

--o USER    $chownprog installed files to USER.

--s         $stripprog installed files.

--t DIRECTORY  install into DIRECTORY.

--T         report an error if DSTFILE is a directory.

+     --help     display this help and exit.

+     --version  display version info and exit.

+

+  -c            (ignored)

+  -C            install only if different (preserve the last data modification time)

+  -d            create directories instead of installing files.

+  -g GROUP      $chgrpprog installed files to GROUP.

+  -m MODE       $chmodprog installed files to MODE.

+  -o USER       $chownprog installed files to USER.

+  -s            $stripprog installed files.

+  -t DIRECTORY  install into DIRECTORY.

+  -T            report an error if DSTFILE is a directory.

 Environment variables override the default commands:

-  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG

+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG

+  RMPROG STRIPPROG

 "

 while test $# -ne 0; do

   case $1 in

-    -c) shift

-        continue;;

+    -c) ;;

+

+    -C) copy_on_change=true;;

-    -d) dir_arg=true

-        shift

-        continue;;

+    -d) dir_arg=true;;

     -g) chgrpcmd="$chgrpprog $2"

-        shift

-        shift

-        continue;;

+	shift;;

     --help) echo "$usage"; exit $?;;

     -m) mode=$2

-        shift

-        shift

 	case $mode in

 	  *' '* | *'	'* | *'

 '*	  | *'*'* | *'?'* | *'['*)

 	    echo "$0: invalid mode: $mode" >&2

 	    exit 1;;

 	esac

-        continue;;

+	shift;;

     -o) chowncmd="$chownprog $2"

-        shift

-        shift

-        continue;;

+	shift;;

-    -s) stripcmd=$stripprog

-        shift

-        continue;;

+    -s) stripcmd=$stripprog;;

-    -t) dstarg=$2

-	shift

-	shift

-	continue;;

+    -t) dst_arg=$2

+	shift;;

-    -T) no_target_directory=true

-	shift

-	continue;;

+    -T) no_target_directory=true;;

     --version) echo "$0 $scriptversion"; exit $?;;

@@ -165,21 +170,22 @@ while test $# -ne 0; do

     *)  break;;

   esac

+  shift

 done

-if test $# -ne 0 && test -z "$dir_arg$dstarg"; then

+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then

   # When -d is used, all remaining arguments are directories to create.

   # When -t is used, the destination is already specified.

   # Otherwise, the last argument is the destination.  Remove it from $@.

   for arg

   do

-    if test -n "$dstarg"; then

+    if test -n "$dst_arg"; then

       # $@ is not empty: it contains at least $arg.

-      set fnord "$@" "$dstarg"

+      set fnord "$@" "$dst_arg"

       shift # fnord

     fi

     shift # arg

-    dstarg=$arg

+    dst_arg=$arg

   done

 fi

@@ -224,7 +230,7 @@ for src

 do

   # Protect names starting with `-'.

   case $src in

-    -*) src=./$src ;;

+    -*) src=./$src;;

   esac

   if test -n "$dir_arg"; then

@@ -242,22 +248,22 @@ do

       exit 1

     fi

-    if test -z "$dstarg"; then

+    if test -z "$dst_arg"; then

       echo "$0: no destination specified." >&2

       exit 1

     fi

-    dst=$dstarg

+    dst=$dst_arg

     # Protect names starting with `-'.

     case $dst in

-      -*) dst=./$dst ;;

+      -*) dst=./$dst;;

     esac

     # If destination is a directory, append the input filename; won't work

     # if double slashes aren't ignored.

     if test -d "$dst"; then

       if test -n "$no_target_directory"; then

-	echo "$0: $dstarg: Is a directory" >&2

+	echo "$0: $dst_arg: Is a directory" >&2

 	exit 1

       fi

       dstdir=$dst

@@ -378,26 +384,19 @@ do

       # directory the slow way, step by step, checking for races as we go.

       case $dstdir in

-	/*) prefix=/ ;;

-	-*) prefix=./ ;;

-	*)  prefix= ;;

+	/*) prefix='/';;

+	-*) prefix='./';;

+	*)  prefix='';;

       esac

-      case $posix_glob in

-        '')

-	  if (set -f) 2>/dev/null; then

-	    posix_glob=true

-	  else

-	    posix_glob=false

-	  fi ;;

-      esac

+      eval "$initialize_posix_glob"

       oIFS=$IFS

       IFS=/

-      $posix_glob && set -f

+      $posix_glob set -f

       set fnord $dstdir

       shift

-      $posix_glob && set +f

+      $posix_glob set +f

       IFS=$oIFS

       prefixes=

@@ -459,41 +458,54 @@ do

     # ignore errors from any of these, just make sure not to ignore

     # errors from the above "$doit $cpprog $src $dsttmp" command.

     #

-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \

-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \