@@ -344,49 +344,7 @@ pkgconfig_DATA = libclamav.pc

 # don't complain that configuration files and databases are not removed, this is intended

 distuninstallcheck_listfiles = find . -type f ! -name clamd.conf ! -name freshclam.conf ! -name daily.cvd ! -name main.cvd -print

 DISTCLEANFILES = target.h

-@DISTCHECK_ENABLE_FLAGS_FALSE@DISTCHECK_CONFIGURE_FLAGS = --enable-milter --disable-clamav

-@DISTCHECK_ENABLE_FLAGS_TRUE@DISTCHECK_CONFIGURE_FLAGS =  \

-@DISTCHECK_ENABLE_FLAGS_TRUE@	--enable-milter --disable-clamav \

-@DISTCHECK_ENABLE_FLAGS_TRUE@	CFLAGS="-Wno-pointer-sign \

-@DISTCHECK_ENABLE_FLAGS_TRUE@	-Werror-implicit-function-declaration \

-@DISTCHECK_ENABLE_FLAGS_TRUE@	-Werror -Wextra -Wall \

-@DISTCHECK_ENABLE_FLAGS_TRUE@	-Wbad-function-cast -Wcast-align \

-@DISTCHECK_ENABLE_FLAGS_TRUE@	-Wendif-labels -Wfloat-equal \

-@DISTCHECK_ENABLE_FLAGS_TRUE@	-Wformat=2 -Wformat-security \

-@DISTCHECK_ENABLE_FLAGS_TRUE@	-Wmissing-declarations \

-@DISTCHECK_ENABLE_FLAGS_TRUE@	-Wmissing-prototypes \

-@DISTCHECK_ENABLE_FLAGS_TRUE@	-Wno-error=missing-prototypes \

-@DISTCHECK_ENABLE_FLAGS_TRUE@	-Wnested-externs \

-@DISTCHECK_ENABLE_FLAGS_TRUE@	-Wno-error=nested-externs \

-@DISTCHECK_ENABLE_FLAGS_TRUE@	-Wpointer-arith \

-@DISTCHECK_ENABLE_FLAGS_TRUE@	-Wstrict-prototypes \

-@DISTCHECK_ENABLE_FLAGS_TRUE@	-Wno-error=strict-prototypes \

-@DISTCHECK_ENABLE_FLAGS_TRUE@	-Wno-switch -Wno-switch-enum \

-@DISTCHECK_ENABLE_FLAGS_TRUE@	-Wundef -Wwrite-strings \

-@DISTCHECK_ENABLE_FLAGS_TRUE@	-Wstrict-overflow=1 -Winit-self \

-@DISTCHECK_ENABLE_FLAGS_TRUE@	-Wmissing-include-dirs \

-@DISTCHECK_ENABLE_FLAGS_TRUE@	-Wstrict-aliasing \

-@DISTCHECK_ENABLE_FLAGS_TRUE@	-Wdeclaration-after-statement \

-@DISTCHECK_ENABLE_FLAGS_TRUE@	-Waggregate-return \

-@DISTCHECK_ENABLE_FLAGS_TRUE@	-Wmissing-format-attribute \

-@DISTCHECK_ENABLE_FLAGS_TRUE@	-Wno-error=missing-format-attribute \

-@DISTCHECK_ENABLE_FLAGS_TRUE@	-Wno-error=type-limits \

-@DISTCHECK_ENABLE_FLAGS_TRUE@	-Wno-error=unused-function \

-@DISTCHECK_ENABLE_FLAGS_TRUE@	-Wno-error=unused-value \

-@DISTCHECK_ENABLE_FLAGS_TRUE@	-Wno-error=unused-variable \

-@DISTCHECK_ENABLE_FLAGS_TRUE@	-Wcast-qual -Wno-error=cast-qual \

-@DISTCHECK_ENABLE_FLAGS_TRUE@	-Wno-error=sign-compare -Wshadow \

-@DISTCHECK_ENABLE_FLAGS_TRUE@	-Wno-error=shadow \

-@DISTCHECK_ENABLE_FLAGS_TRUE@	-Wno-error=uninitialized \

-@DISTCHECK_ENABLE_FLAGS_TRUE@	-fdiagnostics-show-option \

-@DISTCHECK_ENABLE_FLAGS_TRUE@	-Wno-unused-parameter \

-@DISTCHECK_ENABLE_FLAGS_TRUE@	-Wno-error=unreachable-code \

-@DISTCHECK_ENABLE_FLAGS_TRUE@	-Winvalid-pch \

-@DISTCHECK_ENABLE_FLAGS_TRUE@	-Wno-error=invalid-pch -O2 \

-@DISTCHECK_ENABLE_FLAGS_TRUE@	-D_FORTIFY_SOURCE=2 \

-@DISTCHECK_ENABLE_FLAGS_TRUE@	-fstack-protector-all \

-@DISTCHECK_ENABLE_FLAGS_TRUE@	-Wstack-protector \

-@DISTCHECK_ENABLE_FLAGS_TRUE@	-Wno-error=aggregate-return"

+DISTCHECK_CONFIGURE_FLAGS = --enable-milter --disable-clamav --enable-distcheck-werror

 all: clamav-config.h

 	$(MAKE) $(AM_MAKEFLAGS) all-recursive

@@ -13,8 +13,8 @@

 m4_ifndef([AC_AUTOCONF_VERSION],

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

-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,

-[m4_warning([this file was generated for autoconf 2.64.

+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,

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

 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'.])])

@@ -1,6 +1,6 @@

 # Generated from ltmain.m4sh.

-# ltmain.sh (GNU libtool) 2.2.6

+# ltmain.sh (GNU libtool) 2.2.6b

 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996

 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.

@@ -65,7 +65,7 @@

 #       compiler:		$LTCC

 #       compiler flags:		$LTCFLAGS

 #       linker:		$LD (gnu? $with_gnu_ld)

-#       $progname:		(GNU libtool) 2.2.6 Debian-2.2.6a-4

+#       $progname:		(GNU libtool) 2.2.6b Debian-2.2.6b-2

 #       automake:		$automake_version

 #       autoconf:		$autoconf_version

 #

@@ -73,9 +73,9 @@

 PROGRAM=ltmain.sh

 PACKAGE=libtool

-VERSION="2.2.6 Debian-2.2.6a-4"

+VERSION="2.2.6b Debian-2.2.6b-2"

 TIMESTAMP=""

-package_revision=1.3012

+package_revision=1.3017

 # Be Bourne compatible

 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then

@@ -1,12 +1,14 @@

 #! /bin/sh

 # Guess values for system-dependent variables and create Makefiles.

-# Generated by GNU Autoconf 2.64 for ClamAV devel.

+# Generated by GNU Autoconf 2.65 for ClamAV devel.

 #

 # Report bugs to <http://bugs.clamav.net/>.

 #

+#

 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,

-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software

-# Foundation, Inc.

+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,

+# Inc.

+#

 #

 # This configure script is free software; the Free Software Foundation

 # gives unlimited permission to copy, distribute and modify it.

@@ -678,7 +680,8 @@ fi

-exec 7<&0 </dev/null 6>&1

+test -n "$DJDIR" || exec 7<&0 </dev/null

+exec 6>&1

 # Name of the host.

 # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,

@@ -790,8 +793,6 @@ GPERF

 VERSIONSCRIPT_FALSE

 VERSIONSCRIPT_TRUE

 VERSIONSCRIPTFLAG

-DISTCHECK_ENABLE_FLAGS_FALSE

-DISTCHECK_ENABLE_FLAGS_TRUE

 LIBM

 LTDLOPEN

 LT_CONFIG_H

@@ -976,6 +977,7 @@ enable_fdpassing

 enable_clamdtop

 with_libncurses_prefix

 with_libpdcurses_prefix

+enable_distcheck_werror

 '

       ac_precious_vars='build_alias

 host_alias

@@ -1645,6 +1647,8 @@ Optional Features:

   --enable-readdir_r		    enable support for readdir_r

   --disable-fdpassing        don't build file descriptor passing support

   --enable-clamdtop       Enable 'clamdtop' tool [default=auto]

+  --enable-distcheck-werror

+                          enable warnings as error for distcheck [default=no]

 Optional Packages:

   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]

@@ -1679,7 +1683,7 @@ Some influential environment variables:

   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a

               nonstandard directory <lib dir>

   LIBS        libraries to pass to the linker, e.g. -l<library>

-  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if

+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if

               you have headers in a nonstandard directory <include dir>

   CPP         C preprocessor

@@ -1751,7 +1755,7 @@ test -n "$ac_init_help" && exit $ac_status

 if $ac_init_version; then

   cat <<\_ACEOF

 ClamAV configure devel

-generated by GNU Autoconf 2.64

+generated by GNU Autoconf 2.65

 Copyright (C) 2009 Free Software Foundation, Inc.

 This configure script is free software; the Free Software Foundation

@@ -1798,7 +1802,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_retval=1

 fi

   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

-  return $ac_retval

+  as_fn_set_status $ac_retval

 } # ac_fn_c_try_compile

@@ -1844,7 +1848,7 @@ fi

   # left behind by Apple's compiler.  We do this before executing the actions.

   rm -rf conftest.dSYM conftest_ipa8_conftest.oo

   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

-  return $ac_retval

+  as_fn_set_status $ac_retval

 } # ac_fn_c_try_link

@@ -1912,7 +1916,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

     ac_retval=1

 fi

   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

-  return $ac_retval

+  as_fn_set_status $ac_retval

 } # ac_fn_c_try_cpp

@@ -1954,7 +1958,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 fi

   rm -rf conftest.dSYM conftest_ipa8_conftest.oo

   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

-  return $ac_retval

+  as_fn_set_status $ac_retval

 } # ac_fn_c_try_run

@@ -2215,7 +2219,7 @@ This file contains any messages produced by compilers while

 running configure, to aid debugging if configure makes a mistake.

 It was created by ClamAV $as_me devel, which was

-generated by GNU Autoconf 2.64.  Invocation command line was

+generated by GNU Autoconf 2.65.  Invocation command line was

   $ $0 $@

@@ -2468,7 +2472,7 @@ fi

 for ac_site_file in "$ac_site_file1" "$ac_site_file2"

 do

   test "x$ac_site_file" = xNONE && continue

-  if test -r "$ac_site_file"; then

+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then

     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5

 $as_echo "$as_me: loading site script $ac_site_file" >&6;}

     sed 's/^/| /' "$ac_site_file" >&5

@@ -2477,9 +2481,9 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;}

 done

 if test -r "$cache_file"; then

-  # Some versions of bash will fail to source /dev/null (special

-  # files actually), so we avoid doing that.

-  if test -f "$cache_file"; then

+  # Some versions of bash will fail to source /dev/null (special files

+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.

+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then

     { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5

 $as_echo "$as_me: loading cache $cache_file" >&6;}

     case $cache_file in

@@ -3204,6 +3208,7 @@ IFS=$as_save_IFS

 fi

+  test -d ./--version && rmdir ./--version

   if test "${ac_cv_path_mkdir+set}" = set; then

     MKDIR_P="$ac_cv_path_mkdir -p"

   else

@@ -3211,7 +3216,6 @@ fi

     # value for MKDIR_P within a source directory, because that will

     # break other packages using the cache if that directory is

     # removed, or if the value is a relative name.

-    test -d ./--version && rmdir ./--version

     MKDIR_P="$ac_install_sh -d"

   fi

 fi

@@ -3572,8 +3576,8 @@ esac

-macro_version='2.2.6'

-macro_revision='1.3012'

+macro_version='2.2.6b'

+macro_revision='1.3017'

@@ -3973,32 +3977,30 @@ $as_echo "$ac_try_echo"; } >&5

 ... rest of stderr output deleted ...

          10q' conftest.err >conftest.er1

     cat conftest.er1 >&5

-    rm -f conftest.er1 conftest.err

   fi

+  rm -f conftest.er1 conftest.err

   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

   test $ac_status = 0; }

 done

 cat confdefs.h - <<_ACEOF >conftest.$ac_ext

 /* end confdefs.h.  */

-#include <stdio.h>

+

 int

 main ()

 {

-FILE *f = fopen ("conftest.out", "w");

- return ferror (f) || fclose (f) != 0;

   ;

   return 0;

 }

 _ACEOF

 ac_clean_files_save=$ac_clean_files

-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"

+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"

 # Try to create an executable without -o first, disregard a.out.

 # It will help us diagnose broken compilers, and finding out an intuition

 # of exeext.

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5

-$as_echo_n "checking for C compiler default output file name... " >&6; }

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5

+$as_echo_n "checking whether the C compiler works... " >&6; }

 ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`

 # The possible output files:

@@ -4060,10 +4062,10 @@ test "$ac_cv_exeext" = no && ac_cv_exeext=

 else

   ac_file=''

 fi

-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5

-$as_echo "$ac_file" >&6; }

 if test -z "$ac_file"; then :

-  $as_echo "$as_me: failed program was:" >&5

+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

+$as_echo "no" >&6; }

+$as_echo "$as_me: failed program was:" >&5

 sed 's/^/| /' conftest.$ac_ext >&5

 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

@@ -4071,51 +4073,18 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

 { as_fn_set_status 77

 as_fn_error "C compiler cannot create executables

 See \`config.log' for more details." "$LINENO" 5; }; }

+else

+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

+$as_echo "yes" >&6; }

 fi

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5

+$as_echo_n "checking for C compiler default output file name... " >&6; }

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5

+$as_echo "$ac_file" >&6; }

 ac_exeext=$ac_cv_exeext

-# Check that the compiler produces executables we can run.  If not, either

-# the compiler is broken, or we cross compile.

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5

-$as_echo_n "checking whether the C compiler works... " >&6; }

-# If not cross compiling, check that we can run a simple program.

-if test "$cross_compiling" != yes; then

-  if { ac_try='./$ac_file'

-  { { case "(($ac_try" in

-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

-  *) ac_try_echo=$ac_try;;

-esac

-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

-$as_echo "$ac_try_echo"; } >&5

-  (eval "$ac_try") 2>&5

-  ac_status=$?

-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

-  test $ac_status = 0; }; }; then

-    cross_compiling=no

-  else

-    if test "$cross_compiling" = maybe; then

-	cross_compiling=yes

-    else

-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

-as_fn_error "cannot run C compiled programs.

-If you meant to cross compile, use \`--host'.

-See \`config.log' for more details." "$LINENO" 5; }

-    fi

-  fi

-fi

-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

-$as_echo "yes" >&6; }

-

-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out

+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out

 ac_clean_files=$ac_clean_files_save

-# Check that the compiler produces executables we can run.  If not, either

-# the compiler is broken, or we cross compile.

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5

-$as_echo_n "checking whether we are cross compiling... " >&6; }

-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5

-$as_echo "$cross_compiling" >&6; }

-

 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5

 $as_echo_n "checking for suffix of executables... " >&6; }

 if { { ac_try="$ac_link"

@@ -4148,13 +4117,72 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

 as_fn_error "cannot compute suffix of executables: cannot compile and link

 See \`config.log' for more details." "$LINENO" 5; }

 fi

-rm -f conftest$ac_cv_exeext

+rm -f conftest conftest$ac_cv_exeext

 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5

 $as_echo "$ac_cv_exeext" >&6; }

 rm -f conftest.$ac_ext

 EXEEXT=$ac_cv_exeext

 ac_exeext=$EXEEXT

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

+/* end confdefs.h.  */

+#include <stdio.h>

+int

+main ()

+{

+FILE *f = fopen ("conftest.out", "w");

+ return ferror (f) || fclose (f) != 0;

+

+  ;

+  return 0;

+}

+_ACEOF

+ac_clean_files="$ac_clean_files conftest.out"

+# Check that the compiler produces executables we can run.  If not, either

+# the compiler is broken, or we cross compile.

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5

+$as_echo_n "checking whether we are cross compiling... " >&6; }

+if test "$cross_compiling" != yes; then

+  { { ac_try="$ac_link"

+case "(($ac_try" in

+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

+  *) ac_try_echo=$ac_try;;

+esac

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

+$as_echo "$ac_try_echo"; } >&5

+  (eval "$ac_link") 2>&5

+  ac_status=$?

+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

+  test $ac_status = 0; }

+  if { ac_try='./conftest$ac_cv_exeext'

+  { { case "(($ac_try" in

+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

+  *) ac_try_echo=$ac_try;;

+esac

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

+$as_echo "$ac_try_echo"; } >&5

+  (eval "$ac_try") 2>&5

+  ac_status=$?

+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

+  test $ac_status = 0; }; }; then

+    cross_compiling=no

+  else

+    if test "$cross_compiling" = maybe; then

+	cross_compiling=yes

+    else

+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

+as_fn_error "cannot run C compiled programs.

+If you meant to cross compile, use \`--host'.

+See \`config.log' for more details." "$LINENO" 5; }

+    fi

+  fi

+fi

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5

+$as_echo "$cross_compiling" >&6; }

+

+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out

+ac_clean_files=$ac_clean_files_save

 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5

 $as_echo_n "checking for suffix of object files... " >&6; }

 if test "${ac_cv_objext+set}" = set; then :

@@ -5129,13 +5157,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :

 else

   lt_cv_nm_interface="BSD nm"

   echo "int some_variable = 0;" > conftest.$ac_ext

-  (eval echo "\"\$as_me:5132: $ac_compile\"" >&5)

+  (eval echo "\"\$as_me:5160: $ac_compile\"" >&5)

   (eval "$ac_compile" 2>conftest.err)

   cat conftest.err >&5

-  (eval echo "\"\$as_me:5135: $NM \\\"conftest.$ac_objext\\\"\"" >&5)

+  (eval echo "\"\$as_me:5163: $NM \\\"conftest.$ac_objext\\\"\"" >&5)

   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)

   cat conftest.err >&5

-  (eval echo "\"\$as_me:5138: output\"" >&5)

+  (eval echo "\"\$as_me:5166: output\"" >&5)

   cat conftest.out >&5

   if $GREP 'External.*some_variable' conftest.out > /dev/null; then

     lt_cv_nm_interface="MS dumpbin"

@@ -5590,7 +5618,7 @@ irix5* | irix6* | nonstopux*)

   ;;

 # This must be Linux ELF.

-linux* | k*bsd*-gnu)

+linux* | k*bsd*-gnu | kopensolaris*-gnu)

   lt_cv_deplibs_check_method=pass_all

   ;;

@@ -6330,7 +6358,7 @@ ia64-*-hpux*)

   ;;

 *-*-irix6*)

   # Find out which ABI we are using.

-  echo '#line 6333 "configure"' > conftest.$ac_ext

+  echo '#line 6361 "configure"' > conftest.$ac_ext

   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5

   (eval $ac_compile) 2>&5

   ac_status=$?

@@ -7859,11 +7887,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:7862: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:7890: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>conftest.err)

    ac_status=$?

    cat conftest.err >&5

-   echo "$as_me:7866: \$? = $ac_status" >&5

+   echo "$as_me:7894: \$? = $ac_status" >&5

    if (exit $ac_status) && test -s "$ac_outfile"; then

      # The compiler can only warn and ignore the option if not recognized

      # So say no if there are warnings other than the usual output.

@@ -8028,7 +8056,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }

       lt_prog_compiler_static='-non_shared'

       ;;

-    linux* | k*bsd*-gnu)

+    linux* | k*bsd*-gnu | kopensolaris*-gnu)

       case $cc_basename in

       # old Intel for x86_64 which still supported -KPIC.

       ecc*)

@@ -8198,11 +8226,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:8201: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:8229: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>conftest.err)

    ac_status=$?

    cat conftest.err >&5

-   echo "$as_me:8205: \$? = $ac_status" >&5

+   echo "$as_me:8233: \$? = $ac_status" >&5

    if (exit $ac_status) && test -s "$ac_outfile"; then

      # The compiler can only warn and ignore the option if not recognized

      # So say no if there are warnings other than the usual output.

@@ -8303,11 +8331,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:8306: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:8334: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>out/conftest.err)

    ac_status=$?

    cat out/conftest.err >&5

-   echo "$as_me:8310: \$? = $ac_status" >&5

+   echo "$as_me:8338: \$? = $ac_status" >&5

    if (exit $ac_status) && test -s out/conftest2.$ac_objext

    then

      # The compiler can only warn and ignore the option if not recognized

@@ -8358,11 +8386,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:8361: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:8389: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>out/conftest.err)

    ac_status=$?

    cat out/conftest.err >&5

-   echo "$as_me:8365: \$? = $ac_status" >&5

+   echo "$as_me:8393: \$? = $ac_status" >&5

    if (exit $ac_status) && test -s out/conftest2.$ac_objext

    then

      # The compiler can only warn and ignore the option if not recognized

@@ -8501,6 +8529,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie

     fi

     supports_anon_versioning=no

     case `$LD -v 2>&1` in

+      *GNU\ gold*) supports_anon_versioning=yes ;;

       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11

       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...

       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...

@@ -8592,7 +8621,7 @@ _LT_EOF

       archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'

       ;;

-    gnu* | linux* | tpf* | k*bsd*-gnu)

+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)

       tmp_diet=no

       if test "$host_os" = linux-dietlibc; then

 	case $cc_basename in

@@ -10054,7 +10083,7 @@ linux*oldld* | linux*aout* | linux*coff*)

   ;;

 # This must be Linux ELF.

-linux* | k*bsd*-gnu)

+linux* | k*bsd*-gnu | kopensolaris*-gnu)

   version_type=linux

   need_lib_prefix=no

   need_version=no

@@ -10741,7 +10770,7 @@ else

   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

   lt_status=$lt_dlunknown

   cat > conftest.$ac_ext <<_LT_EOF

-#line 10744 "configure"

+#line 10773 "configure"

 #include "confdefs.h"

 #if HAVE_DLFCN_H

@@ -10837,7 +10866,7 @@ else

   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

   lt_status=$lt_dlunknown

   cat > conftest.$ac_ext <<_LT_EOF

-#line 10840 "configure"

+#line 10869 "configure"

 #include "confdefs.h"

 #if HAVE_DLFCN_H

@@ -11509,7 +11538,7 @@ else

   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

   lt_status=$lt_dlunknown

   cat > conftest.$ac_ext <<_LT_EOF

-#line 11512 "configure"

+#line 11541 "configure"

 #include "confdefs.h"

 #if HAVE_DLFCN_H

@@ -11635,7 +11664,7 @@ else

   freebsd* | dragonfly*)

     lt_cv_sys_dlopen_deplibs=yes

     ;;

-  gnu* | linux* | k*bsd*-gnu)

+  gnu* | linux* | k*bsd*-gnu | kopensolaris*-gnu)

     # GNU and its variants, using gnu ld.so (Glibc)

     lt_cv_sys_dlopen_deplibs=yes

     ;;

@@ -12917,14 +12946,6 @@ if test "x$ac_compiler_gnu" = "xyes"; then

 			;;

 	esac

 fi

- if test "x$distcheck_enable_flags" = "x1"; then

-  DISTCHECK_ENABLE_FLAGS_TRUE=

-  DISTCHECK_ENABLE_FLAGS_FALSE='#'

-else

-  DISTCHECK_ENABLE_FLAGS_TRUE='#'

-  DISTCHECK_ENABLE_FLAGS_FALSE=

-fi

-

 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcc bug PR27603" >&5

@@ -19769,6 +19790,25 @@ else

 fi

+# Check whether --enable-distcheck-werror was given.

+if test "${enable_distcheck_werror+set}" = set; then :

+  enableval=$enable_distcheck_werror; enable_distcheckwerror=$enableval

+else

+  enable_distcheckwerror="no"

+fi

+

+

+# Enable distcheck warnings and Werror only for gcc versions that support them,

+# and only after we've run the configure tests.

+# Some configure tests fail (like checking for cos in -lm) if we enable these

+# Werror flags for configure too (for example -Wstrict-prototypes makes

+# configure think that -lm doesn't have cos, hence its in libc).

+if test "x$enable_distcheckwerror" = "xyes"; then

+    if test "$distcheck_enable_flags" = "1"; then

+	CFLAGS="$CFLAGS -Wno-pointer-sign -Werror-implicit-function-declaration -Werror -Wextra -Wall -Wno-error=bad-function-cast -Wbad-function-cast -Wcast-align -Wendif-labels -Wfloat-equal -Wformat=2 -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wno-error=missing-prototypes -Wnested-externs -Wno-error=nested-externs -Wpointer-arith -Wstrict-prototypes -Wno-error=strict-prototypes -Wno-switch -Wno-switch-enum -Wundef -Wwrite-strings -Wstrict-overflow=1 -Winit-self -Wmissing-include-dirs -Wstrict-aliasing -Wdeclaration-after-statement -Waggregate-return -Wmissing-format-attribute -Wno-error=missing-format-attribute -Wno-error=type-limits -Wno-error=unused-function -Wno-error=unused-value -Wno-error=unused-variable -Wcast-qual -Wno-error=cast-qual -Wno-error=sign-compare -Wshadow -Wno-error=shadow -Wno-error=uninitialized -fdiagnostics-show-option -Wno-unused-parameter -Wno-error=unreachable-code -Winvalid-pch -Wno-error=invalid-pch -O2 -D_FORTIFY_SOURCE=2 -fstack-protector-all -Wstack-protector -Wno-error=aggregate-return"

+    fi

+fi

+

 ac_config_files="$ac_config_files libclamav/Makefile clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamdscan/Makefile clamav-milter/Makefile freshclam/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile test/Makefile unit_tests/Makefile clamdtop/Makefile clambc/Makefile Makefile clamav-config libclamav.pc platform.h docs/man/clamav-milter.8 docs/man/clamconf.1 docs/man/clamd.8 docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 docs/man/freshclam.1 docs/man/freshclam.conf.5 docs/man/sigtool.1 docs/man/clamdtop.1"

 cat >confcache <<\_ACEOF

@@ -19910,10 +19950,6 @@ LT_CONFIG_H=clamav-config.h

-if test -z "${DISTCHECK_ENABLE_FLAGS_TRUE}" && test -z "${DISTCHECK_ENABLE_FLAGS_FALSE}"; then

-  as_fn_error "conditional \"DISTCHECK_ENABLE_FLAGS\" was never defined.

-Usually this means the macro was only invoked conditionally." "$LINENO" 5

-fi

 if test -z "${VERSIONSCRIPT_TRUE}" && test -z "${VERSIONSCRIPT_FALSE}"; then

   as_fn_error "conditional \"VERSIONSCRIPT\" was never defined.

 Usually this means the macro was only invoked conditionally." "$LINENO" 5

@@ -20359,7 +20395,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1

 # values after options handling.

 ac_log="

 This file was extended by ClamAV $as_me devel, which was

-generated by GNU Autoconf 2.64.  Invocation command line was

+generated by GNU Autoconf 2.65.  Invocation command line was

   CONFIG_FILES    = $CONFIG_FILES

   CONFIG_HEADERS  = $CONFIG_HEADERS

@@ -20399,6 +20435,7 @@ Usage: $0 [OPTION]... [TAG]...

   -h, --help       print this help, then exit

   -V, --version    print version number and configuration settings, then exit

+      --config     print configuration, then exit

   -q, --quiet, --silent

                    do not print progress messages

   -d, --debug      don't remove temporary files

@@ -20422,10 +20459,11 @@ ClamAV home page: <http://www.clamav.net/>."

 _ACEOF

 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"

 ac_cs_version="\\

 ClamAV config.status devel

-configured by $0, generated by GNU Autoconf 2.64,

-  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

+configured by $0, generated by GNU Autoconf 2.65,

+  with options \\"\$ac_cs_config\\"

 Copyright (C) 2009 Free Software Foundation, Inc.

 This config.status script is free software; the Free Software Foundation

@@ -20463,6 +20501,8 @@ do

     ac_cs_recheck=: ;;

   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )

     $as_echo "$ac_cs_version"; exit ;;

+  --config | --confi | --conf | --con | --co | --c )

+    $as_echo "$ac_cs_config"; exit ;;

   --debug | --debu | --deb | --de | --d | -d )

     debug=: ;;

   --file | --fil | --fi | --f )

@@ -20935,7 +20975,7 @@ s/'"$ac_delim"'$//

 t delim

 :nl

 h

-s/\(.\{148\}\).*/\1/

+s/\(.\{148\}\)..*/\1/

 t more1

 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/

 p

@@ -20949,7 +20989,7 @@ s/.\{148\}//

 t nl

 :delim

 h

-s/\(.\{148\}\).*/\1/

+s/\(.\{148\}\)..*/\1/

 t more2

 s/["\\]/\\&/g; s/^/"/; s/$/"/

 p

@@ -50,7 +50,7 @@ AM_CPPFLAGS	       += -DLT_CONFIG_H='<$(LT_CONFIG_H)>' \

 			  -DLTDL -I. -I$(srcdir) -Ilibltdl \

 			  -I$(srcdir)/libltdl -I$(srcdir)/libltdl

 AM_LDFLAGS	       += -no-undefined

-LTDL_VERSION_INFO	= -version-info 9:0:2

+LTDL_VERSION_INFO	= -version-info 9:1:2

 noinst_LTLIBRARIES	+= $(LT_DLLOADERS)

@@ -364,7 +364,7 @@ EXTRA_DIST = lt__dirent.c lt__strl.c COPYING.LIB README argz_.h argz.c

 CLEANFILES = libltdl.la libltdlc.la libdlloader.la $(ltdl_LIBOBJS) \

 	$(ltdl_LTLIBOBJS)

 MOSTLYCLEANFILES = argz.h argz.h-t

-LTDL_VERSION_INFO = -version-info 9:0:2

+LTDL_VERSION_INFO = -version-info 9:1:2

 @INSTALL_LTDL_TRUE@ltdlincludedir = $(includedir)/libltdl

 @INSTALL_LTDL_TRUE@ltdlinclude_HEADERS = libltdl/lt_system.h \

 @INSTALL_LTDL_TRUE@			  libltdl/lt_error.h \

@@ -529,7 +529,8 @@ find_module (lt_dlhandle *handle, const char *dir, const char *libdir,

   /* Try to open the old library first; if it was dlpreopened,

      we want the preopened version of it, even if a dlopenable

      module is available.  */

-  if (old_name && tryall_dlopen (handle, old_name, advise, 0) == 0)

+  if (old_name && tryall_dlopen (handle, old_name,

+			  advise, lt_dlloader_find ("lt_preopen") ) == 0)

     {

       return 0;

     }

@@ -1345,7 +1346,7 @@ try_dlopen (lt_dlhandle *phandle, const char *filename, const char *ext,

 	    }

 #endif

 	}

-      if (!file)

+      else

 	{

 	  file = fopen (attempt, LT_READTEXT_MODE);

 	}

@@ -2445,7 +2445,7 @@ linux*oldld* | linux*aout* | linux*coff*)

   ;;

 # This must be Linux ELF.

-linux* | k*bsd*-gnu)

+linux* | k*bsd*-gnu | kopensolaris*-gnu)

   version_type=linux

   need_lib_prefix=no

   need_version=no

@@ -3084,7 +3084,7 @@ irix5* | irix6* | nonstopux*)

   ;;

 # This must be Linux ELF.

-linux* | k*bsd*-gnu)

+linux* | k*bsd*-gnu | kopensolaris*-gnu)

   lt_cv_deplibs_check_method=pass_all

   ;;

@@ -3705,7 +3705,7 @@ m4_if([$1], [CXX], [

 	    ;;

 	esac

 	;;

-      linux* | k*bsd*-gnu)

+      linux* | k*bsd*-gnu | kopensolaris*-gnu)

 	case $cc_basename in

 	  KCC*)

 	    # KAI C++ Compiler

@@ -3989,7 +3989,7 @@ m4_if([$1], [CXX], [

       _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'

       ;;

-    linux* | k*bsd*-gnu)

+    linux* | k*bsd*-gnu | kopensolaris*-gnu)

       case $cc_basename in

       # old Intel for x86_64 which still supported -KPIC.

       ecc*)

@@ -4285,6 +4285,7 @@ dnl Note also adjust exclude_expsyms for C++ above.

     fi

     supports_anon_versioning=no

     case `$LD -v 2>&1` in

+      *GNU\ gold*) supports_anon_versioning=yes ;;

       *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11

       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...

       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...

@@ -4376,7 +4377,7 @@ _LT_EOF

       _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'

       ;;

-    gnu* | linux* | tpf* | k*bsd*-gnu)

+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)

       tmp_diet=no

       if test "$host_os" = linux-dietlibc; then

 	case $cc_basename in

@@ -5860,7 +5861,7 @@ if test "$_lt_caught_CXX_error" != yes; then

         _LT_TAGVAR(inherit_rpath, $1)=yes

         ;;

-      linux* | k*bsd*-gnu)

+      linux* | k*bsd*-gnu | kopensolaris*-gnu)

         case $cc_basename in

           KCC*)

 	    # Kuck and Associates, Inc. (KAI) C++ Compiler

@@ -467,7 +467,7 @@ AC_CACHE_CHECK([whether deplibs are loaded by dlopen],

   freebsd* | dragonfly*)

     lt_cv_sys_dlopen_deplibs=yes

     ;;

-  gnu* | linux* | k*bsd*-gnu)

+  gnu* | linux* | k*bsd*-gnu | kopensolaris*-gnu)

     # GNU and its variants, using gnu ld.so (Glibc)

     lt_cv_sys_dlopen_deplibs=yes

     ;;

@@ -9,15 +9,15 @@

 # Generated from ltversion.in.

-# serial 3012 ltversion.m4

+# serial 3017 ltversion.m4

 # This file is part of GNU Libtool

-m4_define([LT_PACKAGE_VERSION], [2.2.6])

-m4_define([LT_PACKAGE_REVISION], [1.3012])

+m4_define([LT_PACKAGE_VERSION], [2.2.6b])

+m4_define([LT_PACKAGE_REVISION], [1.3017])

 AC_DEFUN([LTVERSION_VERSION],

-[macro_version='2.2.6'

-macro_revision='1.3012'

+[macro_version='2.2.6b'

+macro_revision='1.3017'

 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])

 _LT_DECL(, macro_revision, 0)

 ])