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

 /* in_port_t is defined */

 #undef HAVE_IN_PORT_T

-/* Define to 1 if you have the `check' library (-lcheck). */

-#undef HAVE_LIBCHECK

-

 /* Define if you have the gmp library. */

 #undef HAVE_LIBGMP

@@ -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

 		;;

@@ -13194,8 +13194,7 @@ fi

 done

-

-{ echo "$as_me:$LINENO: checking for srunner_create in -lcheck" >&5

+    { echo "$as_me:$LINENO: checking for srunner_create in -lcheck" >&5

 echo $ECHO_N "checking for srunner_create in -lcheck... $ECHO_C" >&6; }

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

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

@@ -13257,12 +13256,7 @@ fi

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

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

 if test $ac_cv_lib_check_srunner_create = yes; then

-  cat >>confdefs.h <<_ACEOF

-#define HAVE_LIBCHECK 1

-_ACEOF

-

-  LIBS="-lcheck $LIBS"

-

+  LCHECK="yes"

 else

   LCHECK="no"

 fi

@@ -324,7 +324,7 @@ dnl    CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage"

 dnl    LDFLAGS="$LDFLAGS -lgcov"

     AC_DEFINE([HAVE_CHECK], 1, [Enable 'check' unit tests])

     AC_CHECK_HEADERS(check.h)

-    AC_CHECK_LIB(check, srunner_create, , LCHECK="no")

+    AC_CHECK_LIB(check, srunner_create, LCHECK="yes", LCHECK="no")

 fi

 if test "$LCHECK" = "no"; then

@@ -55,7 +55,7 @@ target_triplet = @target@

 @VERSIONSCRIPT_TRUE@am__append_1 = -Wl,@VERSIONSCRIPTFLAG@,@top_srcdir@/libclamav/libclamav.map

 subdir = libclamav

 DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \

-	$(srcdir)/Makefile.in COPYING

+	$(srcdir)/Makefile.in

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \

@@ -2,4 +2,4 @@ TESTS = check_clamav

 bin_PROGRAMS = check_clamav

 check_clamav_SOURCES = check_clamav.c $(top_builddir)/libclamav/clamav.h

 check_clamav_CFLAGS = 

-check_clamav_LDADD = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@

+check_clamav_LDADD = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@ -lcheck

@@ -200,7 +200,7 @@ top_builddir = @top_builddir@

 top_srcdir = @top_srcdir@

 check_clamav_SOURCES = check_clamav.c $(top_builddir)/libclamav/clamav.h

 check_clamav_CFLAGS = 

-check_clamav_LDADD = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@

+check_clamav_LDADD = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@ -lcheck

 all: all-am

 .SUFFIXES: