@@ -1,3 +1,11 @@

+Tue Jul 15 18:25:53 EEST 2008 (edwin)

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

+  * configure.in:

+	* use pkg-config to locate check, if available (bb #1093)

+	* make --enable-coverage depends on unit tests being activated

+	* fix a typo in bzip2 configure check

+  * unit_tests/Makefile.am: remove temporary log files on make clean

+

 Mon Jul 14 22:09:22 EEST 2008 (edwin)

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

   * libclamav/htmlnorm.c: fix crash in js parser (bb #1096)

@@ -131,6 +131,8 @@ CC = @CC@

 CCDEPMODE = @CCDEPMODE@

 CFGDIR = @CFGDIR@

 CFLAGS = @CFLAGS@

+CHECK_CFLAGS = @CHECK_CFLAGS@

+CHECK_LIBS = @CHECK_LIBS@

 CLAMAVGROUP = @CLAMAVGROUP@

 CLAMAVUSER = @CLAMAVUSER@

 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@

@@ -160,7 +162,6 @@ INSTALL_DATA = @INSTALL_DATA@

 INSTALL_PROGRAM = @INSTALL_PROGRAM@

 INSTALL_SCRIPT = @INSTALL_SCRIPT@

 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

-LCHECK = @LCHECK@

 LCOV = @LCOV@

 LDFLAGS = @LDFLAGS@

 LIBBZ2 = @LIBBZ2@

@@ -188,6 +189,7 @@ PACKAGE_STRING = @PACKAGE_STRING@

 PACKAGE_TARNAME = @PACKAGE_TARNAME@

 PACKAGE_VERSION = @PACKAGE_VERSION@

 PATH_SEPARATOR = @PATH_SEPARATOR@

+PKG_CONFIG = @PKG_CONFIG@

 RANLIB = @RANLIB@

 SED = @SED@

 SET_MAKE = @SET_MAKE@

@@ -6782,6 +6782,164 @@ AC_SUBST([SED])

 AC_MSG_RESULT([$SED])

 ])

+# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-

+# 

+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.

+#

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

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

+# the Free Software Foundation; either version 2 of the License, or

+# (at your option) any later version.

+#

+# This program is distributed in the hope that it will be useful, but

+# WITHOUT ANY WARRANTY; without even the implied warranty of

+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+# General Public License for more details.

+#

+# You should have received a copy of the GNU General Public License

+# along with this program; if not, write to the Free Software

+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

+#

+# As a special exception to the GNU General Public License, if you

+# distribute this file as part of a program that contains a

+# configuration script generated by Autoconf, you may include it under

+# the same distribution terms that you use for the rest of that program.

+

+# PKG_PROG_PKG_CONFIG([MIN-VERSION])

+# ----------------------------------

+AC_DEFUN([PKG_PROG_PKG_CONFIG],

+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])

+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])

+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl

+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then

+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])

+fi

+if test -n "$PKG_CONFIG"; then

+	_pkg_min_version=m4_default([$1], [0.9.0])

+	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])

+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then

+		AC_MSG_RESULT([yes])

+	else

+		AC_MSG_RESULT([no])

+		PKG_CONFIG=""

+	fi

+		

+fi[]dnl

+])# PKG_PROG_PKG_CONFIG

+

+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])

+#

+# Check to see whether a particular set of modules exists.  Similar

+# to PKG_CHECK_MODULES(), but does not set variables or print errors.

+#

+#

+# Similar to PKG_CHECK_MODULES, make sure that the first instance of

+# this or PKG_CHECK_MODULES is called, or make sure to call

+# PKG_CHECK_EXISTS manually

+# --------------------------------------------------------------

+AC_DEFUN([PKG_CHECK_EXISTS],

+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl

+if test -n "$PKG_CONFIG" && \

+    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then

+  m4_ifval([$2], [$2], [:])

+m4_ifvaln([$3], [else

+  $3])dnl

+fi])

+

+

+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])

+# ---------------------------------------------

+m4_define([_PKG_CONFIG],

+[if test -n "$PKG_CONFIG"; then

+    if test -n "$$1"; then

+        pkg_cv_[]$1="$$1"

+    else

+        PKG_CHECK_EXISTS([$3],

+                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],

+			 [pkg_failed=yes])

+    fi

+else

+	pkg_failed=untried

+fi[]dnl

+])# _PKG_CONFIG

+

+# _PKG_SHORT_ERRORS_SUPPORTED

+# -----------------------------

+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],

+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])

+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then

+        _pkg_short_errors_supported=yes

+else

+        _pkg_short_errors_supported=no

+fi[]dnl

+])# _PKG_SHORT_ERRORS_SUPPORTED

+

+

+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],

+# [ACTION-IF-NOT-FOUND])

+#

+#

+# Note that if there is a possibility the first call to

+# PKG_CHECK_MODULES might not happen, you should be sure to include an

+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac

+#

+#

+# --------------------------------------------------------------

+AC_DEFUN([PKG_CHECK_MODULES],

+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl

+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl

+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl

+

+pkg_failed=no

+AC_MSG_CHECKING([for $1])

+

+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])

+_PKG_CONFIG([$1][_LIBS], [libs], [$2])

+

+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS

+and $1[]_LIBS to avoid the need to call pkg-config.

+See the pkg-config man page for more details.])

+

+if test $pkg_failed = yes; then

+        _PKG_SHORT_ERRORS_SUPPORTED

+        if test $_pkg_short_errors_supported = yes; then

+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`

+        else 

+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`

+        fi

+	# Put the nasty error message in config.log where it belongs

+	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD

+

+	ifelse([$4], , [AC_MSG_ERROR(dnl

+[Package requirements ($2) were not met:

+

+$$1_PKG_ERRORS

+

+Consider adjusting the PKG_CONFIG_PATH environment variable if you

+installed software in a non-standard prefix.

+

+_PKG_TEXT

+])],

+		[AC_MSG_RESULT([no])

+                $4])

+elif test $pkg_failed = untried; then

+	ifelse([$4], , [AC_MSG_FAILURE(dnl

+[The pkg-config script could not be found or is too old.  Make sure it

+is in your PATH or set the PKG_CONFIG environment variable to the full

+path to pkg-config.

+

+_PKG_TEXT

+

+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],

+		[$4])

+else

+	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS

+	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS

+        AC_MSG_RESULT([yes])

+	ifelse([$3], , :, [$3])

+fi[]dnl

+])# PKG_CHECK_MODULES

+

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

 #

 # This file is free software; the Free Software Foundation

@@ -113,6 +113,8 @@ CC = @CC@

 CCDEPMODE = @CCDEPMODE@

 CFGDIR = @CFGDIR@

 CFLAGS = @CFLAGS@

+CHECK_CFLAGS = @CHECK_CFLAGS@

+CHECK_LIBS = @CHECK_LIBS@

 CLAMAVGROUP = @CLAMAVGROUP@

 CLAMAVUSER = @CLAMAVUSER@

 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@

@@ -142,7 +144,6 @@ INSTALL_DATA = @INSTALL_DATA@

 INSTALL_PROGRAM = @INSTALL_PROGRAM@

 INSTALL_SCRIPT = @INSTALL_SCRIPT@

 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

-LCHECK = @LCHECK@

 LCOV = @LCOV@

 LDFLAGS = @LDFLAGS@

 LIBBZ2 = @LIBBZ2@

@@ -170,6 +171,7 @@ PACKAGE_STRING = @PACKAGE_STRING@

 PACKAGE_TARNAME = @PACKAGE_TARNAME@

 PACKAGE_VERSION = @PACKAGE_VERSION@

 PATH_SEPARATOR = @PATH_SEPARATOR@

+PKG_CONFIG = @PKG_CONFIG@

 RANLIB = @RANLIB@

 SED = @SED@

 SET_MAKE = @SET_MAKE@

@@ -98,6 +98,8 @@ CC = @CC@

 CCDEPMODE = @CCDEPMODE@

 CFGDIR = @CFGDIR@

 CFLAGS = @CFLAGS@

+CHECK_CFLAGS = @CHECK_CFLAGS@

+CHECK_LIBS = @CHECK_LIBS@

 CLAMAVGROUP = @CLAMAVGROUP@

 CLAMAVUSER = @CLAMAVUSER@

 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@

@@ -127,7 +129,6 @@ INSTALL_DATA = @INSTALL_DATA@

 INSTALL_PROGRAM = @INSTALL_PROGRAM@

 INSTALL_SCRIPT = @INSTALL_SCRIPT@

 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

-LCHECK = @LCHECK@

 LCOV = @LCOV@

 LDFLAGS = @LDFLAGS@

 LIBBZ2 = @LIBBZ2@

@@ -155,6 +156,7 @@ PACKAGE_STRING = @PACKAGE_STRING@

 PACKAGE_TARNAME = @PACKAGE_TARNAME@

 PACKAGE_VERSION = @PACKAGE_VERSION@

 PATH_SEPARATOR = @PATH_SEPARATOR@

+PKG_CONFIG = @PKG_CONFIG@

 RANLIB = @RANLIB@

 SED = @SED@

 SET_MAKE = @SET_MAKE@

@@ -118,6 +118,8 @@ CC = @CC@

 CCDEPMODE = @CCDEPMODE@

 CFGDIR = @CFGDIR@

 CFLAGS = @CFLAGS@

+CHECK_CFLAGS = @CHECK_CFLAGS@

+CHECK_LIBS = @CHECK_LIBS@

 CLAMAVGROUP = @CLAMAVGROUP@

 CLAMAVUSER = @CLAMAVUSER@

 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@

@@ -147,7 +149,6 @@ INSTALL_DATA = @INSTALL_DATA@

 INSTALL_PROGRAM = @INSTALL_PROGRAM@

 INSTALL_SCRIPT = @INSTALL_SCRIPT@

 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

-LCHECK = @LCHECK@

 LCOV = @LCOV@

 LDFLAGS = @LDFLAGS@

 LIBBZ2 = @LIBBZ2@

@@ -175,6 +176,7 @@ PACKAGE_STRING = @PACKAGE_STRING@

 PACKAGE_TARNAME = @PACKAGE_TARNAME@

 PACKAGE_VERSION = @PACKAGE_VERSION@

 PATH_SEPARATOR = @PATH_SEPARATOR@

+PKG_CONFIG = @PKG_CONFIG@

 RANLIB = @RANLIB@

 SED = @SED@

 SET_MAKE = @SET_MAKE@

@@ -107,6 +107,8 @@ CC = @CC@

 CCDEPMODE = @CCDEPMODE@

 CFGDIR = @CFGDIR@

 CFLAGS = @CFLAGS@

+CHECK_CFLAGS = @CHECK_CFLAGS@

+CHECK_LIBS = @CHECK_LIBS@

 CLAMAVGROUP = @CLAMAVGROUP@

 CLAMAVUSER = @CLAMAVUSER@

 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@

@@ -136,7 +138,6 @@ INSTALL_DATA = @INSTALL_DATA@

 INSTALL_PROGRAM = @INSTALL_PROGRAM@

 INSTALL_SCRIPT = @INSTALL_SCRIPT@

 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

-LCHECK = @LCHECK@

 LCOV = @LCOV@

 LDFLAGS = @LDFLAGS@

 LIBBZ2 = @LIBBZ2@

@@ -164,6 +165,7 @@ PACKAGE_STRING = @PACKAGE_STRING@

 PACKAGE_TARNAME = @PACKAGE_TARNAME@

 PACKAGE_VERSION = @PACKAGE_VERSION@

 PATH_SEPARATOR = @PATH_SEPARATOR@

+PKG_CONFIG = @PKG_CONFIG@

 RANLIB = @RANLIB@

 SED = @SED@

 SET_MAKE = @SET_MAKE@

@@ -100,6 +100,8 @@ CC = @CC@

 CCDEPMODE = @CCDEPMODE@

 CFGDIR = @CFGDIR@

 CFLAGS = @CFLAGS@

+CHECK_CFLAGS = @CHECK_CFLAGS@

+CHECK_LIBS = @CHECK_LIBS@

 CLAMAVGROUP = @CLAMAVGROUP@

 CLAMAVUSER = @CLAMAVUSER@

 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@

@@ -129,7 +131,6 @@ INSTALL_DATA = @INSTALL_DATA@

 INSTALL_PROGRAM = @INSTALL_PROGRAM@

 INSTALL_SCRIPT = @INSTALL_SCRIPT@

 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

-LCHECK = @LCHECK@

 LCOV = @LCOV@

 LDFLAGS = @LDFLAGS@

 LIBBZ2 = @LIBBZ2@

@@ -157,6 +158,7 @@ PACKAGE_STRING = @PACKAGE_STRING@

 PACKAGE_TARNAME = @PACKAGE_TARNAME@

 PACKAGE_VERSION = @PACKAGE_VERSION@

 PATH_SEPARATOR = @PATH_SEPARATOR@

+PKG_CONFIG = @PKG_CONFIG@

 RANLIB = @RANLIB@

 SED = @SED@

 SET_MAKE = @SET_MAKE@

@@ -868,7 +868,9 @@ VERSIONSCRIPTFLAG

 VERSIONSCRIPT_TRUE

 VERSIONSCRIPT_FALSE

 GPERF

-LCHECK

+PKG_CONFIG

+CHECK_CFLAGS

+CHECK_LIBS

 ENABLE_COVERAGE_TRUE

 ENABLE_COVERAGE_FALSE

 ENABLE_UT_INSTALL_TRUE

@@ -915,7 +917,10 @@ CFLAGS

 LDFLAGS

 LIBS

 CPPFLAGS

-CPP'

+CPP

+PKG_CONFIG

+CHECK_CFLAGS

+CHECK_LIBS'

 # Initialize some variables set by options.

@@ -1564,6 +1569,10 @@ Some influential environment variables:

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

               you have headers in a nonstandard directory <include dir>

   CPP         C preprocessor

+  PKG_CONFIG  path to pkg-config utility

+  CHECK_CFLAGS

+              C compiler flags for CHECK, overriding pkg-config

+  CHECK_LIBS  linker flags for CHECK, overriding pkg-config

 Use these variables to override the choices made by `configure' or to help

 it to find libraries and programs with nonstandard names/locations.

@@ -4778,7 +4787,7 @@ ia64-*-hpux*)

   ;;

 *-*-irix6*)

   # Find out which ABI we are using.

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

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

   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5

   ac_status=$?

@@ -6868,11 +6877,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:6871: $lt_compile\"" >&5)

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

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

    ac_status=$?

    cat conftest.err >&5

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

+   echo "$as_me:6884: \$? = $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.

@@ -7158,11 +7167,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:7161: $lt_compile\"" >&5)

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

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

    ac_status=$?

    cat conftest.err >&5

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

+   echo "$as_me:7174: \$? = $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.

@@ -7262,11 +7271,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:7265: $lt_compile\"" >&5)

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

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

    ac_status=$?

    cat out/conftest.err >&5

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

+   echo "$as_me:7278: \$? = $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

@@ -9639,7 +9648,7 @@ else

   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

   lt_status=$lt_dlunknown

   cat > conftest.$ac_ext <<EOF

-#line 9642 "configure"

+#line 9651 "configure"

 #include "confdefs.h"

 #if HAVE_DLFCN_H

@@ -9739,7 +9748,7 @@ else

   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

   lt_status=$lt_dlunknown

   cat > conftest.$ac_ext <<EOF

-#line 9742 "configure"

+#line 9751 "configure"

 #include "confdefs.h"

 #if HAVE_DLFCN_H

@@ -13064,9 +13073,217 @@ else

 fi

-LCHECK=""

 if test "$enable_check_ut" != "no" ; then

-    if test "${ac_cv_header_check_h+set}" = set; then

+

+

+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then

+	if test -n "$ac_tool_prefix"; then

+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.

+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

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

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

+else

+  case $PKG_CONFIG in

+  [\\/]* | ?:[\\/]*)

+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.

+  ;;

+  *)

+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

+for as_dir in $PATH

+do

+  IFS=$as_save_IFS

+  test -z "$as_dir" && as_dir=.

+  for ac_exec_ext in '' $ac_executable_extensions; do

+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"

+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

+    break 2

+  fi

+done

+done

+IFS=$as_save_IFS

+

+  ;;

+esac

+fi

+PKG_CONFIG=$ac_cv_path_PKG_CONFIG

+if test -n "$PKG_CONFIG"; then

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

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

+else

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

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

+fi

+

+

+fi

+if test -z "$ac_cv_path_PKG_CONFIG"; then

+  ac_pt_PKG_CONFIG=$PKG_CONFIG

+  # Extract the first word of "pkg-config", so it can be a program name with args.

+set dummy pkg-config; ac_word=$2

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

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

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

+else

+  case $ac_pt_PKG_CONFIG in

+  [\\/]* | ?:[\\/]*)

+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.

+  ;;

+  *)

+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

+for as_dir in $PATH

+do

+  IFS=$as_save_IFS

+  test -z "$as_dir" && as_dir=.

+  for ac_exec_ext in '' $ac_executable_extensions; do

+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"

+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

+    break 2

+  fi

+done

+done

+IFS=$as_save_IFS

+

+  ;;

+esac

+fi

+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG

+if test -n "$ac_pt_PKG_CONFIG"; then

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

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

+else

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

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

+fi

+

+  if test "x$ac_pt_PKG_CONFIG" = x; then

+    PKG_CONFIG=""

+  else

+    case $cross_compiling:$ac_tool_warned in

+yes:)

+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

+whose name does not start with the host triplet.  If you think this

+configuration is useful to you, please write to autoconf@gnu.org." >&5

+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

+whose name does not start with the host triplet.  If you think this

+configuration is useful to you, please write to autoconf@gnu.org." >&2;}

+ac_tool_warned=yes ;;

+esac

+    PKG_CONFIG=$ac_pt_PKG_CONFIG

+  fi

+else

+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"

+fi

+

+fi

+if test -n "$PKG_CONFIG"; then

+	_pkg_min_version=0.9.0

+	{ echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5

+echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }

+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then

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

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

+	else

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

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

+		PKG_CONFIG=""

+	fi

+

+fi

+

+pkg_failed=no

+{ echo "$as_me:$LINENO: checking for CHECK" >&5

+echo $ECHO_N "checking for CHECK... $ECHO_C" >&6; }

+

+if test -n "$PKG_CONFIG"; then

+    if test -n "$CHECK_CFLAGS"; then

+        pkg_cv_CHECK_CFLAGS="$CHECK_CFLAGS"

+    else

+        if test -n "$PKG_CONFIG" && \

+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"check\"") >&5

+  ($PKG_CONFIG --exists --print-errors "check") 2>&5

+  ac_status=$?

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

+  (exit $ac_status); }; then

+  pkg_cv_CHECK_CFLAGS=`$PKG_CONFIG --cflags "check" 2>/dev/null`

+else

+  pkg_failed=yes

+fi

+    fi

+else

+	pkg_failed=untried

+fi

+if test -n "$PKG_CONFIG"; then

+    if test -n "$CHECK_LIBS"; then

+        pkg_cv_CHECK_LIBS="$CHECK_LIBS"

+    else

+        if test -n "$PKG_CONFIG" && \

+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"check\"") >&5

+  ($PKG_CONFIG --exists --print-errors "check") 2>&5

+  ac_status=$?

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

+  (exit $ac_status); }; then

+  pkg_cv_CHECK_LIBS=`$PKG_CONFIG --libs "check" 2>/dev/null`

+else

+  pkg_failed=yes

+fi

+    fi

+else

+	pkg_failed=untried

+fi

+

+

+

+if test $pkg_failed = yes; then

+

+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then

+        _pkg_short_errors_supported=yes

+else

+        _pkg_short_errors_supported=no

+fi

+        if test $_pkg_short_errors_supported = yes; then

+	        CHECK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "check"`

+        else

+	        CHECK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "check"`

+        fi

+	# Put the nasty error message in config.log where it belongs

+	echo "$CHECK_PKG_ERRORS" >&5

+

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

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

+                { echo "$as_me:$LINENO: WARNING: pkg-config not found

+			   Alternatively, you may set the environment variables CHECK_CFLAGS

+and CHECK_LIBS to avoid the need to call pkg-config.

+See the pkg-config man page for more details." >&5

+echo "$as_me: WARNING: pkg-config not found

+			   Alternatively, you may set the environment variables CHECK_CFLAGS

+and CHECK_LIBS to avoid the need to call pkg-config.

+See the pkg-config man page for more details." >&2;}

+elif test $pkg_failed = untried; then

+	{ echo "$as_me:$LINENO: WARNING: pkg-config not found

+			   Alternatively, you may set the environment variables CHECK_CFLAGS

+and CHECK_LIBS to avoid the need to call pkg-config.

+See the pkg-config man page for more details." >&5

+echo "$as_me: WARNING: pkg-config not found

+			   Alternatively, you may set the environment variables CHECK_CFLAGS

+and CHECK_LIBS to avoid the need to call pkg-config.

+See the pkg-config man page for more details." >&2;}

+else

+	CHECK_CFLAGS=$pkg_cv_CHECK_CFLAGS

+	CHECK_LIBS=$pkg_cv_CHECK_LIBS

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

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

+	:

+fi

+	save_CPPFLAGS="$CPPFLAGS";

+	CPPFLAGS="$CPPFLAGS $CHECK_CFLAGS"

+	save_LIBS="$LIBS"

+	LIBS="$LIBS $CHECK_LIBS"

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

   { echo "$as_me:$LINENO: checking for check.h" >&5

 echo $ECHO_N "checking for check.h... $ECHO_C" >&6; }

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

@@ -13198,14 +13415,9 @@ echo "${ECHO_T}$ac_cv_header_check_h" >&6; }

 fi

 if test $ac_cv_header_check_h = yes; then

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

-else

-  ac_check_lib_save_LIBS=$LIBS

-LIBS="-lcheck  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF

+				{ echo "$as_me:$LINENO: checking linking with check" >&5

+echo $ECHO_N "checking linking with check... $ECHO_C" >&6; }

+				cat >conftest.$ac_ext <<_ACEOF

 /* confdefs.h.  */

 _ACEOF

 cat confdefs.h >>conftest.$ac_ext

@@ -13245,29 +13457,15 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

 	 test ! -s conftest.err

        } && test -s conftest$ac_exeext &&

        $as_test_x conftest$ac_exeext; then

-  ac_cv_lib_check_srunner_create=yes

-else

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

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

-

-	ac_cv_lib_check_srunner_create=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_check_srunner_create" >&5

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

-if test $ac_cv_lib_check_srunner_create = yes; then

-

-				LCHECK="-lcheck";

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

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

 cat >>confdefs.h <<\_ACEOF

 #define HAVE_CHECK 1

 _ACEOF

-				# Check whether --enable-tests-install was given.

+					# Check whether --enable-tests-install was given.

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

   enableval=$enable_tests_install; enable_ut_install=$enableval

 else

@@ -13276,23 +13474,35 @@ fi

 else

-  LCHECK="no"

-fi

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

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

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

+echo "${ECHO_T}failed" >&6; };CHECK_LIBS=

-else

-  LCHECK="no"

 fi

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

+      conftest$ac_exeext conftest.$ac_ext

 fi

-if test "$LCHECK" = "no" -a "$enable_check_ut" = "yes"; then

-    echo

-    echo "   ERROR!  Check was configured, but not found.  Get it from http://check.sf.net/"

-    exit 1

-fi

+	LIBS="$save_LIBS"

+	CPPFLAGS="$save_CPPFLAGS"

+fi

+

+if test "x$CHECK_LIBS" = "x" -a "$enable_check_ut" = "yes"; then

+    { { echo "$as_me:$LINENO: error:

+		  $CHECK_PKG_ERRORS

+		  ERROR!  Check was configured, but not found.  Get it from http://check.sf.net/

+		 " >&5

+echo "$as_me: error:

+		  $CHECK_PKG_ERRORS

+		  ERROR!  Check was configured, but not found.  Get it from http://check.sf.net/

+		 " >&2;}

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

+fi

 # Check whether --enable-coverage was given.

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

@@ -13303,6 +13513,11 @@ fi

 if test "x$enable_coverage" = "xyes"; then

+	if test "x$CHECK_LIBS" = "x"; then

+		{ { echo "$as_me:$LINENO: error: Coverage testing required, but unit tests not enabled!" >&5

+echo "$as_me: error: Coverage testing required, but unit tests not enabled!" >&2;}

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

+	fi

 	if test "x$ac_compiler_gnu" != "xyes"; then

 		{ { echo "$as_me:$LINENO: error: coverage testing only works if gcc is used" >&5

 echo "$as_me: error: coverage testing only works if gcc is used" >&2;}

@@ -14984,7 +15199,7 @@ fi

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

 else

-  $ac_cv_c_cve_2008_1372="no"

+  ac_cv_c_cve_2008_1372="no"

 fi

@@ -20471,7 +20686,9 @@ VERSIONSCRIPTFLAG!$VERSIONSCRIPTFLAG$ac_delim

 VERSIONSCRIPT_TRUE!$VERSIONSCRIPT_TRUE$ac_delim

 VERSIONSCRIPT_FALSE!$VERSIONSCRIPT_FALSE$ac_delim

 GPERF!$GPERF$ac_delim

-LCHECK!$LCHECK$ac_delim

+PKG_CONFIG!$PKG_CONFIG$ac_delim

+CHECK_CFLAGS!$CHECK_CFLAGS$ac_delim

+CHECK_LIBS!$CHECK_LIBS$ac_delim

 ENABLE_COVERAGE_TRUE!$ENABLE_COVERAGE_TRUE$ac_delim

 ENABLE_COVERAGE_FALSE!$ENABLE_COVERAGE_FALSE$ac_delim

 ENABLE_UT_INSTALL_TRUE!$ENABLE_UT_INSTALL_TRUE$ac_delim

@@ -20511,7 +20728,7 @@ LIBOBJS!$LIBOBJS$ac_delim

 LTLIBOBJS!$LTLIBOBJS$ac_delim

 _ACEOF

-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 44; then

+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 46; then

     break

   elif $ac_last_try; then

     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

@@ -322,30 +322,39 @@ enable_ut_install=no

 AC_ARG_ENABLE(check,

 [  --enable-check           Enable 'check' unit tests (default=auto)], enable_check_ut=$enableval, enable_check_ut="auto" )

-LCHECK=""

 if test "$enable_check_ut" != "no" ; then

-    AC_CHECK_HEADER(check.h,

-	[

-		AC_CHECK_LIB(check, srunner_create,

+	PKG_CHECK_MODULES([CHECK],[check],[], [AC_MSG_WARN([pkg-config not found

+			   _PKG_TEXT])])

+	save_CPPFLAGS="$CPPFLAGS";

+	CPPFLAGS="$CPPFLAGS $CHECK_CFLAGS"

+	save_LIBS="$LIBS"

+	LIBS="$LIBS $CHECK_LIBS"

+	AC_CHECK_HEADER(check.h,

 			[

-				LCHECK="-lcheck";

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

-				AC_ARG_ENABLE(tests-install,

+				AC_MSG_CHECKING([linking with check])

+				AC_LINK_IFELSE([AC_LANG_CALL([],[srunner_create])],[

+					AC_MSG_RESULT([ok])

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

+					AC_ARG_ENABLE(tests-install,

 					      AC_HELP_STRING([--enable-tests-install],

 					      [install unit tests

 					       @<:@default=no@:>@]),

 					       [enable_ut_install=$enableval],[enable_ut_install="no"])

-			 ], LCHECK="no")

-	],[LCHECK="no"])

+					],

+					[AC_MSG_RESULT([failed]);CHECK_LIBS=]

+				)

+			])

+	LIBS="$save_LIBS"

+	CPPFLAGS="$save_CPPFLAGS"

 fi

-if test "$LCHECK" = "no" -a "$enable_check_ut" = "yes"; then

-    echo

-    echo "   ERROR!  Check was configured, but not found.  Get it from http://check.sf.net/"

-    exit 1

+if test "x$CHECK_LIBS" = "x" -a "$enable_check_ut" = "yes"; then

+    AC_MSG_ERROR([

+		  $CHECK_PKG_ERRORS

+		  ERROR!  Check was configured, but not found.  Get it from http://check.sf.net/

+		 ])

 fi

-AC_SUBST(LCHECK)

 AC_ARG_ENABLE(coverage,

 	      AC_HELP_STRING([--enable-coverage],

 			     [turn on test coverage

@@ -353,6 +362,9 @@ AC_ARG_ENABLE(coverage,

 [enable_cov=$enableval],[enable_cov="no"])

 if test "x$enable_coverage" = "xyes"; then

+	if test "x$CHECK_LIBS" = "x"; then

+		AC_MSG_ERROR([Coverage testing required, but unit tests not enabled!])

+	fi

 	if test "x$ac_compiler_gnu" != "xyes"; then

 		AC_MSG_ERROR([coverage testing only works if gcc is used])

 	fi

@@ -443,7 +455,7 @@ then

     if test "$HAVE_LIBBZ2" = "yes"; then

 	AC_CHECK_HEADER([bzlib.h],

 			[AC_C_CVE_2008_1372],

-			[$ac_cv_c_cve_2008_1372="no"])

+			[ac_cv_c_cve_2008_1372="no"])

 	if test "$ac_cv_c_cve_2008_1372" = "bugged"; then

 		AC_MSG_WARN([****** bzip2 libraries are affected by the CVE-2008-1372 bug])

 		AC_MSG_WARN([****** We strongly suggest you to update to bzip2 1.0.5.])

@@ -77,6 +77,8 @@ CC = @CC@

 CCDEPMODE = @CCDEPMODE@

 CFGDIR = @CFGDIR@

 CFLAGS = @CFLAGS@

+CHECK_CFLAGS = @CHECK_CFLAGS@

+CHECK_LIBS = @CHECK_LIBS@

 CLAMAVGROUP = @CLAMAVGROUP@

 CLAMAVUSER = @CLAMAVUSER@

 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@

@@ -106,7 +108,6 @@ INSTALL_DATA = @INSTALL_DATA@

 INSTALL_PROGRAM = @INSTALL_PROGRAM@

 INSTALL_SCRIPT = @INSTALL_SCRIPT@

 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

-LCHECK = @LCHECK@

 LCOV = @LCOV@

 LDFLAGS = @LDFLAGS@

 LIBBZ2 = @LIBBZ2@