@@ -132,7 +132,7 @@ AC_LIB_PROG_LD_GNU

 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-

-# serial 52 Debian 1.5.26-1 AC_PROG_LIBTOOL

+# serial 52 Debian 1.5.26-3 AC_PROG_LIBTOOL

 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)

@@ -165,6 +165,9 @@

 /* Define to 1 if you have the <libmilter/mfapi.h> header file. */

 #undef HAVE_LIBMILTER_MFAPI_H

+/* Define to 1 if you have the `z' library (-lz). */

+#undef HAVE_LIBZ

+

 /* Define to 1 if you have the <limits.h> header file. */

 #undef HAVE_LIMITS_H

@@ -1,10 +1,10 @@

 #! /bin/sh

 # Attempt to guess a canonical system name.

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

-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,

-#   Inc.

+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008

+#   Free Software Foundation, Inc.

-timestamp='2007-07-22'

+timestamp='2008-01-23'

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

 # under the terms of the GNU General Public License as published by

@@ -56,8 +56,8 @@ version="\

 GNU config.guess ($timestamp)

 Originally written by Per Bothner.

-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005

-Free Software Foundation, Inc.

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

+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

 This is free software; see the source for copying conditions.  There is NO

 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."

@@ -532,7 +532,7 @@ EOF

 		echo rs6000-ibm-aix3.2

 	fi

 	exit ;;

-    *:AIX:*:[45])

+    *:AIX:*:[456])

 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`

 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then

 		IBM_ARCH=rs6000

@@ -799,6 +799,9 @@ EOF

 	    EM64T | authenticamd)

 		echo x86_64-unknown-interix${UNAME_RELEASE}

 		exit ;;

+	    IA64)

+		echo ia64-unknown-interix${UNAME_RELEASE}

+		exit ;;

 	esac ;;

     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)

 	echo i${UNAME_MACHINE}-pc-mks

@@ -833,7 +836,14 @@ EOF

 	echo ${UNAME_MACHINE}-pc-minix

 	exit ;;

     arm*:Linux:*:*)

-	echo ${UNAME_MACHINE}-unknown-linux-gnu

+	eval $set_cc_for_build

+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \

+	    | grep -q __ARM_EABI__

+	then

+	    echo ${UNAME_MACHINE}-unknown-linux-gnu

+	else

+	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi

+	fi

 	exit ;;

     avr32*:Linux:*:*)

 	echo ${UNAME_MACHINE}-unknown-linux-gnu

@@ -954,8 +964,8 @@ EOF

     x86_64:Linux:*:*)

 	echo x86_64-unknown-linux-gnu

 	exit ;;

-    xtensa:Linux:*:*)

-    	echo xtensa-unknown-linux-gnu

+    xtensa*:Linux:*:*)

+    	echo ${UNAME_MACHINE}-unknown-linux-gnu

 	exit ;;

     i*86:Linux:*:*)

 	# The BFD linker knows what the default object file format is, so

@@ -1474,9 +1484,9 @@ This script, last modified $timestamp, has failed to recognize

 the operating system you are using. It is advised that you

 download the most up to date version of the config scripts from

-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess

+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD

 and

-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub

+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD

 If the version you run ($0) is already up to date, please

 send the following data and any information you think might be

@@ -1,10 +1,10 @@

 #! /bin/sh

 # Configuration validation subroutine script.

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

-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,

-#   Inc.

+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008

+#   Free Software Foundation, Inc.

-timestamp='2007-06-28'

+timestamp='2008-01-16'

 # This file is (in principle) common to ALL GNU software.

 # The presence of a machine in this file suggests that SOME GNU software

@@ -72,8 +72,8 @@ Report bugs and patches to <config-patches@gnu.org>."

 version="\

 GNU config.sub ($timestamp)

-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005

-Free Software Foundation, Inc.

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

+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

 This is free software; see the source for copying conditions.  There is NO

 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."

@@ -369,10 +369,14 @@ case $basic_machine in

 	| v850-* | v850e-* | vax-* \

 	| we32k-* \

 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \

-	| xstormy16-* | xtensa-* \

+	| xstormy16-* | xtensa*-* \

 	| ymp-* \

 	| z8k-*)

 		;;

+	# Recognize the basic CPU types without company name, with glob match.

+	xtensa*)

+		basic_machine=$basic_machine-unknown

+		;;

 	# Recognize the various machine names and aliases which stand

 	# for a CPU type and a company and sometimes even an OS.

 	386bsd)

@@ -443,6 +447,14 @@ case $basic_machine in

 		basic_machine=ns32k-sequent

 		os=-dynix

 		;;

+	blackfin)

+		basic_machine=bfin-unknown

+		os=-linux

+		;;

+	blackfin-*)

+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`

+		os=-linux

+		;;

 	c90)

 		basic_machine=c90-cray

 		os=-unicos

@@ -668,6 +680,14 @@ case $basic_machine in

 		basic_machine=m68k-isi

 		os=-sysv

 		;;

+	m68knommu)

+		basic_machine=m68k-unknown

+		os=-linux

+		;;

+	m68knommu-*)

+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`

+		os=-linux

+		;;

 	m88k-omron*)

 		basic_machine=m88k-omron

 		;;

@@ -813,6 +833,14 @@ case $basic_machine in

 		basic_machine=i860-intel

 		os=-osf

 		;;

+	parisc)

+		basic_machine=hppa-unknown

+		os=-linux

+		;;

+	parisc-*)

+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`

+		os=-linux

+		;;

 	pbd)

 		basic_machine=sparc-tti

 		;;

@@ -1021,6 +1049,10 @@ case $basic_machine in

 		basic_machine=tic6x-unknown

 		os=-coff

 		;;

+	tile*)

+		basic_machine=tile-unknown

+		os=-linux-gnu

+		;;

 	tx39)

 		basic_machine=mipstx39-unknown

 		;;

@@ -43,7 +43,7 @@ EXIT_FAILURE=1

 PROGRAM=ltmain.sh

 PACKAGE=libtool

-VERSION="1.5.26 Debian 1.5.26-1"

+VERSION="1.5.26 Debian 1.5.26-3"

 TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"

 # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).

@@ -13319,7 +13319,7 @@ fi

 { echo "$as_me:$LINENO: result: $ac_cv_lib_z_inflateEnd" >&5

 echo "${ECHO_T}$ac_cv_lib_z_inflateEnd" >&6; }

 if test $ac_cv_lib_z_inflateEnd = yes; then

-  LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -L$ZLIB_HOME/lib -lz";

+  LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -L$ZLIB_HOME/lib -lz";FRESHCLAM_LIBS="$FRESHCLAM_LIBS -L$ZLIB_HOME/lib -lz";

 cat >>confdefs.h <<\_ACEOF

 #define HAVE_ZLIB_H 1

 _ACEOF

@@ -13330,6 +13330,81 @@ echo "$as_me: error: Please install zlib and zlib-devel packages" >&2;}

    { (exit 1); exit 1; }; }

 fi

+

+{ echo "$as_me:$LINENO: checking for gzopen in -lz" >&5

+echo $ECHO_N "checking for gzopen in -lz... $ECHO_C" >&6; }

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

+  echo $ECHO_N "(cached) $ECHO_C" >&6

+else

+  ac_check_lib_save_LIBS=$LIBS

+LIBS="-lz  $LIBS"

+cat >conftest.$ac_ext <<_ACEOF

+/* confdefs.h.  */

+_ACEOF

+cat confdefs.h >>conftest.$ac_ext

+cat >>conftest.$ac_ext <<_ACEOF

+/* end confdefs.h.  */

+

+/* Override any GCC internal prototype to avoid an error.

+   Use char because int might match the return type of a GCC

+   builtin and then its argument prototype would still apply.  */

+#ifdef __cplusplus

+extern "C"

+#endif

+char gzopen ();

+int

+main ()

+{

+return gzopen ();

+  ;

+  return 0;

+}

+_ACEOF

+rm -f conftest.$ac_objext conftest$ac_exeext

+if { (ac_try="$ac_link"

+case "(($ac_try" in

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

+  *) ac_try_echo=$ac_try;;

+esac

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

+  (eval "$ac_link") 2>conftest.er1

+  ac_status=$?

+  grep -v '^ *+' conftest.er1 >conftest.err

+  rm -f conftest.er1

+  cat conftest.err >&5

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

+  (exit $ac_status); } && {

+	 test -z "$ac_c_werror_flag" ||

+	 test ! -s conftest.err

+       } && test -s conftest$ac_exeext &&

+       $as_test_x conftest$ac_exeext; then

+  ac_cv_lib_z_gzopen=yes

+else

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

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

+

+	ac_cv_lib_z_gzopen=no

+fi

+

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

+      conftest$ac_exeext conftest.$ac_ext

+LIBS=$ac_check_lib_save_LIBS

+fi

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_gzopen" >&5

+echo "${ECHO_T}$ac_cv_lib_z_gzopen" >&6; }

+if test $ac_cv_lib_z_gzopen = yes; then

+  cat >>confdefs.h <<_ACEOF

+#define HAVE_LIBZ 1

+_ACEOF

+

+  LIBS="-lz $LIBS"

+

+else

+  { { echo "$as_me:$LINENO: error: Your zlib is missing gzopen()" >&5

+echo "$as_me: error: Your zlib is missing gzopen()" >&2;}

+   { (exit 1); exit 1; }; }

+fi

+

 	LDFLAGS="$save_LDFLAGS"

     else

 	{ echo "$as_me:$LINENO: checking for inflateEnd in -lz" >&5

@@ -13394,7 +13469,7 @@ fi

 { echo "$as_me:$LINENO: result: $ac_cv_lib_z_inflateEnd" >&5

 echo "${ECHO_T}$ac_cv_lib_z_inflateEnd" >&6; }

 if test $ac_cv_lib_z_inflateEnd = yes; then

-  LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lz";

+  LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lz";FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lz";

 cat >>confdefs.h <<\_ACEOF

 #define HAVE_ZLIB_H 1

 _ACEOF

@@ -13405,6 +13480,81 @@ echo "$as_me: error: Please install zlib and zlib-devel packages" >&2;}

    { (exit 1); exit 1; }; }

 fi

+

+{ echo "$as_me:$LINENO: checking for gzopen in -lz" >&5

+echo $ECHO_N "checking for gzopen in -lz... $ECHO_C" >&6; }

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

+  echo $ECHO_N "(cached) $ECHO_C" >&6

+else

+  ac_check_lib_save_LIBS=$LIBS

+LIBS="-lz  $LIBS"

+cat >conftest.$ac_ext <<_ACEOF

+/* confdefs.h.  */

+_ACEOF

+cat confdefs.h >>conftest.$ac_ext

+cat >>conftest.$ac_ext <<_ACEOF

+/* end confdefs.h.  */

+

+/* Override any GCC internal prototype to avoid an error.

+   Use char because int might match the return type of a GCC

+   builtin and then its argument prototype would still apply.  */

+#ifdef __cplusplus

+extern "C"

+#endif

+char gzopen ();

+int

+main ()

+{

+return gzopen ();

+  ;

+  return 0;

+}

+_ACEOF

+rm -f conftest.$ac_objext conftest$ac_exeext

+if { (ac_try="$ac_link"

+case "(($ac_try" in

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

+  *) ac_try_echo=$ac_try;;

+esac

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

+  (eval "$ac_link") 2>conftest.er1

+  ac_status=$?

+  grep -v '^ *+' conftest.er1 >conftest.err

+  rm -f conftest.er1

+  cat conftest.err >&5

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

+  (exit $ac_status); } && {

+	 test -z "$ac_c_werror_flag" ||

+	 test ! -s conftest.err

+       } && test -s conftest$ac_exeext &&

+       $as_test_x conftest$ac_exeext; then

+  ac_cv_lib_z_gzopen=yes

+else

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

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

+

+	ac_cv_lib_z_gzopen=no

+fi

+

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

+      conftest$ac_exeext conftest.$ac_ext

+LIBS=$ac_check_lib_save_LIBS

+fi

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_gzopen" >&5

+echo "${ECHO_T}$ac_cv_lib_z_gzopen" >&6; }

+if test $ac_cv_lib_z_gzopen = yes; then

+  cat >>confdefs.h <<_ACEOF

+#define HAVE_LIBZ 1

+_ACEOF

+

+  LIBS="-lz $LIBS"

+

+else

+  { { echo "$as_me:$LINENO: error: Your zlib is missing gzopen()" >&5

+echo "$as_me: error: Your zlib is missing gzopen()" >&2;}

+   { (exit 1); exit 1; }; }

+fi

+

     fi

 fi

@@ -365,10 +365,12 @@ else

 	CPPFLAGS="$CPPFLAGS -I$ZLIB_HOME/include"

 	save_LDFLAGS="$LDFLAGS"

 	LDFLAGS="$LIBS -L$ZLIB_HOME/lib"

-	AC_CHECK_LIB([z], [inflateEnd], [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -L$ZLIB_HOME/lib -lz"; AC_DEFINE([HAVE_ZLIB_H],1,zlib installed)], AC_MSG_ERROR([Please install zlib and zlib-devel packages]))

+	AC_CHECK_LIB([z], [inflateEnd], [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -L$ZLIB_HOME/lib -lz";FRESHCLAM_LIBS="$FRESHCLAM_LIBS -L$ZLIB_HOME/lib -lz"; AC_DEFINE([HAVE_ZLIB_H],1,zlib installed)], AC_MSG_ERROR([Please install zlib and zlib-devel packages]))

+	AC_CHECK_LIB([z], [gzopen], [], AC_MSG_ERROR([Your zlib is missing gzopen()]))

 	LDFLAGS="$save_LDFLAGS"

     else

-	AC_CHECK_LIB([z], [inflateEnd], [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lz"; AC_DEFINE([HAVE_ZLIB_H],1,zlib installed)], AC_MSG_ERROR([Please install zlib and zlib-devel packages]))

+	AC_CHECK_LIB([z], [inflateEnd], [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lz";FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lz"; AC_DEFINE([HAVE_ZLIB_H],1,zlib installed)], AC_MSG_ERROR([Please install zlib and zlib-devel packages]))

+	AC_CHECK_LIB([z], [gzopen],[], AC_MSG_ERROR([Your zlib is missing gzopen()]))

     fi

 fi