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

+Thu Jul 10 19:41:37 EEST 2008 (edwin)

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

+ * unit_tests/: add unit tests for binaries

+ * build system: enable unit tests by default (if check is available)

+		 add --enable-coverage to run gcov/lcov

+		 add --enable-tests-install to install test files 

+

 Thu Jul 10 16:02:50 EEST 2008 (edwin)

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

  * unit_tests/:

@@ -149,6 +149,8 @@ ECHO_T = @ECHO_T@

 EGREP = @EGREP@

 EXEEXT = @EXEEXT@

 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@

+GCOV = @GCOV@

+GENHTML = @GENHTML@

 GETENT = @GETENT@

 GPERF = @GPERF@

 GREP = @GREP@

@@ -159,6 +161,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@

 INSTALL_SCRIPT = @INSTALL_SCRIPT@

 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

 LCHECK = @LCHECK@

+LCOV = @LCOV@

 LDFLAGS = @LDFLAGS@

 LIBBZ2 = @LIBBZ2@

 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@

@@ -111,9 +111,6 @@

 /* Enable 'check' unit tests */

 #undef HAVE_CHECK

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

-#undef HAVE_CHECK_H

-

 /* ancillary data style fd pass */

 #undef HAVE_CONTROL_IN_MSGHDR

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

 EGREP = @EGREP@

 EXEEXT = @EXEEXT@

 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@

+GCOV = @GCOV@

+GENHTML = @GENHTML@

 GETENT = @GETENT@

 GPERF = @GPERF@

 GREP = @GREP@

@@ -141,6 +143,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@

 INSTALL_SCRIPT = @INSTALL_SCRIPT@

 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

 LCHECK = @LCHECK@

+LCOV = @LCOV@

 LDFLAGS = @LDFLAGS@

 LIBBZ2 = @LIBBZ2@

 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@

@@ -116,6 +116,8 @@ ECHO_T = @ECHO_T@

 EGREP = @EGREP@

 EXEEXT = @EXEEXT@

 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@

+GCOV = @GCOV@

+GENHTML = @GENHTML@

 GETENT = @GETENT@

 GPERF = @GPERF@

 GREP = @GREP@

@@ -126,6 +128,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@

 INSTALL_SCRIPT = @INSTALL_SCRIPT@

 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

 LCHECK = @LCHECK@

+LCOV = @LCOV@

 LDFLAGS = @LDFLAGS@

 LIBBZ2 = @LIBBZ2@

 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@

@@ -136,6 +136,8 @@ ECHO_T = @ECHO_T@

 EGREP = @EGREP@

 EXEEXT = @EXEEXT@

 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@

+GCOV = @GCOV@

+GENHTML = @GENHTML@

 GETENT = @GETENT@

 GPERF = @GPERF@

 GREP = @GREP@

@@ -146,6 +148,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@

 INSTALL_SCRIPT = @INSTALL_SCRIPT@

 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

 LCHECK = @LCHECK@

+LCOV = @LCOV@

 LDFLAGS = @LDFLAGS@

 LIBBZ2 = @LIBBZ2@

 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@

@@ -125,6 +125,8 @@ ECHO_T = @ECHO_T@

 EGREP = @EGREP@

 EXEEXT = @EXEEXT@

 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@

+GCOV = @GCOV@

+GENHTML = @GENHTML@

 GETENT = @GETENT@

 GPERF = @GPERF@

 GREP = @GREP@

@@ -135,6 +137,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@

 INSTALL_SCRIPT = @INSTALL_SCRIPT@

 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

 LCHECK = @LCHECK@

+LCOV = @LCOV@

 LDFLAGS = @LDFLAGS@

 LIBBZ2 = @LIBBZ2@

 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@

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

 EGREP = @EGREP@

 EXEEXT = @EXEEXT@

 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@

+GCOV = @GCOV@

+GENHTML = @GENHTML@

 GETENT = @GETENT@

 GPERF = @GPERF@

 GREP = @GREP@

@@ -128,6 +130,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@

 INSTALL_SCRIPT = @INSTALL_SCRIPT@

 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

 LCHECK = @LCHECK@

+LCOV = @LCOV@

 LDFLAGS = @LDFLAGS@

 LIBBZ2 = @LIBBZ2@

 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@

@@ -869,6 +869,13 @@ VERSIONSCRIPT_TRUE

 VERSIONSCRIPT_FALSE

 GPERF

 LCHECK

+ENABLE_COVERAGE_TRUE

+ENABLE_COVERAGE_FALSE

+ENABLE_UT_INSTALL_TRUE

+ENABLE_UT_INSTALL_FALSE

+GCOV

+LCOV

+GENHTML

 MAINTAINER_MODE_TRUE

 MAINTAINER_MODE_FALSE

 MAINT

@@ -1498,7 +1505,9 @@ Optional Features:

   --disable-libtool-lock  avoid locking (might break parallel builds)

   --disable-gcc-vcheck	  do not check for buggy gcc version

   --enable-experimental	enable experimental code

-  --enable-check           Enable 'check' unit tests

+  --enable-check           Enable 'check' unit tests (default=auto)

+  --enable-tests-install  install unit tests [default=no]

+  --enable-coverage       turn on test coverage [default=no]

   --enable-maintainer-mode enable make rules and dependencies not useful

                           (and sometimes confusing) to the casual installer

   --disable-zlib-vcheck	  do not check for buggy zlib version

@@ -4768,7 +4777,7 @@ ia64-*-hpux*)

   ;;

 *-*-irix6*)

   # Find out which ABI we are using.

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

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

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

   (eval $ac_compile) 2>&5

   ac_status=$?

@@ -6858,11 +6867,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:6861: $lt_compile\"" >&5)

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

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

    ac_status=$?

    cat conftest.err >&5

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

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

@@ -7148,11 +7157,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:7151: $lt_compile\"" >&5)

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

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

    ac_status=$?

    cat conftest.err >&5

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

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

@@ -7252,11 +7261,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:7255: $lt_compile\"" >&5)

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

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

    ac_status=$?

    cat out/conftest.err >&5

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

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

@@ -9629,7 +9638,7 @@ else

   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

   lt_status=$lt_dlunknown

   cat > conftest.$ac_ext <<EOF

-#line 9632 "configure"

+#line 9641 "configure"

 #include "confdefs.h"

 #if HAVE_DLFCN_H

@@ -9729,7 +9738,7 @@ else

   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

   lt_status=$lt_dlunknown

   cat > conftest.$ac_ext <<EOF

-#line 9732 "configure"

+#line 9741 "configure"

 #include "confdefs.h"

 #if HAVE_DLFCN_H

@@ -13044,37 +13053,30 @@ _ACEOF

 fi

-enable_check_ut=no

+enable_check_ut=auto

+enable_ut_install=no

 # Check whether --enable-check was given.

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

-  enableval=$enable_check; enable_check_ut=yes

+  enableval=$enable_check; enable_check_ut=$enableval

+else

+  enable_check_ut="auto"

 fi

 LCHECK=""

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

-

-cat >>confdefs.h <<\_ACEOF

-#define HAVE_CHECK 1

-_ACEOF

-

-

-for ac_header in check.h

-do

-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

-  { echo "$as_me:$LINENO: checking for $ac_header" >&5

-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }

-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

+    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

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

 fi

-ac_res=`eval echo '${'$as_ac_Header'}'`

-	       { echo "$as_me:$LINENO: result: $ac_res" >&5

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

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

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

 else

   # Is the header compilable?

-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5

-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }

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

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

 cat >conftest.$ac_ext <<_ACEOF

 /* confdefs.h.  */

 _ACEOF

@@ -13082,7 +13084,7 @@ cat confdefs.h >>conftest.$ac_ext

 cat >>conftest.$ac_ext <<_ACEOF

 /* end confdefs.h.  */

 $ac_includes_default

-#include <$ac_header>

+#include <check.h>

 _ACEOF

 rm -f conftest.$ac_objext

 if { (ac_try="$ac_compile"

@@ -13114,15 +13116,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

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

 # Is the header present?

-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5

-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }

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

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

 cat >conftest.$ac_ext <<_ACEOF

 /* confdefs.h.  */

 _ACEOF

 cat confdefs.h >>conftest.$ac_ext

 cat >>conftest.$ac_ext <<_ACEOF

 /* end confdefs.h.  */

-#include <$ac_header>

+#include <check.h>

 _ACEOF

 if { (ac_try="$ac_cpp conftest.$ac_ext"

 case "(($ac_try" in

@@ -13155,25 +13157,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6; }

 # So?  What about this header?

 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

   yes:no: )

-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5

-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}

-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5

-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}

+    { echo "$as_me:$LINENO: WARNING: check.h: accepted by the compiler, rejected by the preprocessor!" >&5

+echo "$as_me: WARNING: check.h: accepted by the compiler, rejected by the preprocessor!" >&2;}

+    { echo "$as_me:$LINENO: WARNING: check.h: proceeding with the compiler's result" >&5

+echo "$as_me: WARNING: check.h: proceeding with the compiler's result" >&2;}

     ac_header_preproc=yes

     ;;

   no:yes:* )

-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5

-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}

-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5

-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}

-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5

-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}

-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5

-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}

-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5

-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}

-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5

-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}

+    { echo "$as_me:$LINENO: WARNING: check.h: present but cannot be compiled" >&5

+echo "$as_me: WARNING: check.h: present but cannot be compiled" >&2;}

+    { echo "$as_me:$LINENO: WARNING: check.h:     check for missing prerequisite headers?" >&5

+echo "$as_me: WARNING: check.h:     check for missing prerequisite headers?" >&2;}

+    { echo "$as_me:$LINENO: WARNING: check.h: see the Autoconf documentation" >&5

+echo "$as_me: WARNING: check.h: see the Autoconf documentation" >&2;}

+    { echo "$as_me:$LINENO: WARNING: check.h:     section \"Present But Cannot Be Compiled\"" >&5

+echo "$as_me: WARNING: check.h:     section \"Present But Cannot Be Compiled\"" >&2;}

+    { echo "$as_me:$LINENO: WARNING: check.h: proceeding with the preprocessor's result" >&5

+echo "$as_me: WARNING: check.h: proceeding with the preprocessor's result" >&2;}

+    { echo "$as_me:$LINENO: WARNING: check.h: in the future, the compiler will take precedence" >&5

+echo "$as_me: WARNING: check.h: in the future, the compiler will take precedence" >&2;}

     ( cat <<\_ASBOX

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

 ## Report this to http://bugs.clamav.net/ ##

@@ -13182,28 +13184,20 @@ _ASBOX

      ) | sed "s/^/$as_me: WARNING:     /" >&2

     ;;

 esac

-{ echo "$as_me:$LINENO: checking for $ac_header" >&5

-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }

-if { as_var=$as_ac_Header; eval "test \"\${$as_var+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

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

 else

-  eval "$as_ac_Header=\$ac_header_preproc"

-fi

-ac_res=`eval echo '${'$as_ac_Header'}'`

-	       { echo "$as_me:$LINENO: result: $ac_res" >&5

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

-

+  ac_cv_header_check_h=$ac_header_preproc

 fi

-if test `eval echo '${'$as_ac_Header'}'` = yes; then

-  cat >>confdefs.h <<_ACEOF

-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1

-_ACEOF

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

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

 fi

+if test $ac_cv_header_check_h = yes; then

-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

@@ -13265,20 +13259,204 @@ 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"

+

+				LCHECK="-lcheck";

+

+cat >>confdefs.h <<\_ACEOF

+#define HAVE_CHECK 1

+_ACEOF

+

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

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

+  enableval=$enable_tests_install; enable_ut_install=$enableval

+else

+  enable_ut_install="no"

+fi

+

+

+else

+  LCHECK="no"

+fi

+

+

 else

   LCHECK="no"

 fi

+

 fi

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

+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

+# Check whether --enable-coverage was given.

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

+  enableval=$enable_coverage; enable_cov=$enableval

+else

+  enable_cov="no"

+fi

+

+

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

+	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;}

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

+	fi

+

+	CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage"

+	LDFLAGS="$LDFLAGS -lgcov"

+fi

+

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

+  ENABLE_COVERAGE_TRUE=

+  ENABLE_COVERAGE_FALSE='#'

+else

+  ENABLE_COVERAGE_TRUE='#'

+  ENABLE_COVERAGE_FALSE=

+fi

+

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

+  ENABLE_UT_INSTALL_TRUE=

+  ENABLE_UT_INSTALL_FALSE='#'

+else

+  ENABLE_UT_INSTALL_TRUE='#'

+  ENABLE_UT_INSTALL_FALSE=

+fi

+

+for ac_prog in gcov

+do

+  # Extract the first word of "$ac_prog", so it can be a program name with args.

+set dummy $ac_prog; 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_prog_GCOV+set}" = set; then

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

+else

+  if test -n "$GCOV"; then

+  ac_cv_prog_GCOV="$GCOV" # Let the user override the test.

+else

+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_prog_GCOV="$ac_prog"

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

+    break 2

+  fi

+done

+done

+IFS=$as_save_IFS

+

+fi

+fi

+GCOV=$ac_cv_prog_GCOV

+if test -n "$GCOV"; then

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

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

+else

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

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

+fi

+

+

+  test -n "$GCOV" && break

+done

+test -n "$GCOV" || GCOV="false"

+

+for ac_prog in lcov

+do

+  # Extract the first word of "$ac_prog", so it can be a program name with args.

+set dummy $ac_prog; 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_prog_LCOV+set}" = set; then

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

+else

+  if test -n "$LCOV"; then

+  ac_cv_prog_LCOV="$LCOV" # Let the user override the test.

+else

+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_prog_LCOV="$ac_prog"

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

+    break 2

+  fi

+done

+done

+IFS=$as_save_IFS

+

+fi

+fi

+LCOV=$ac_cv_prog_LCOV

+if test -n "$LCOV"; then

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

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

+else

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

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

+fi

+

+

+  test -n "$LCOV" && break

+done

+test -n "$LCOV" || LCOV="false"

+

+for ac_prog in genhtml

+do

+  # Extract the first word of "$ac_prog", so it can be a program name with args.

+set dummy $ac_prog; 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_prog_GENHTML+set}" = set; then

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

+else

+  if test -n "$GENHTML"; then

+  ac_cv_prog_GENHTML="$GENHTML" # Let the user override the test.

+else

+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_prog_GENHTML="$ac_prog"

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

+    break 2

+  fi

+done

+done

+IFS=$as_save_IFS

+

+fi

+fi

+GENHTML=$ac_cv_prog_GENHTML

+if test -n "$GENHTML"; then

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

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

+else

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

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

+fi

+

+

+  test -n "$GENHTML" && break

+done

+test -n "$GENHTML" || GENHTML="false"

+

 have_pthreads=no

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

@@ -19456,6 +19634,20 @@ echo "$as_me: error: conditional \"VERSIONSCRIPT\" was never defined.

 Usually this means the macro was only invoked conditionally." >&2;}

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

 fi

+if test -z "${ENABLE_COVERAGE_TRUE}" && test -z "${ENABLE_COVERAGE_FALSE}"; then

+  { { echo "$as_me:$LINENO: error: conditional \"ENABLE_COVERAGE\" was never defined.

+Usually this means the macro was only invoked conditionally." >&5

+echo "$as_me: error: conditional \"ENABLE_COVERAGE\" was never defined.

+Usually this means the macro was only invoked conditionally." >&2;}

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

+fi

+if test -z "${ENABLE_UT_INSTALL_TRUE}" && test -z "${ENABLE_UT_INSTALL_FALSE}"; then

+  { { echo "$as_me:$LINENO: error: conditional \"ENABLE_UT_INSTALL\" was never defined.

+Usually this means the macro was only invoked conditionally." >&5

+echo "$as_me: error: conditional \"ENABLE_UT_INSTALL\" was never defined.

+Usually this means the macro was only invoked conditionally." >&2;}

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

+fi

 if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then

   { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.

 Usually this means the macro was only invoked conditionally." >&5

@@ -20188,6 +20380,13 @@ VERSIONSCRIPT_TRUE!$VERSIONSCRIPT_TRUE$ac_delim

 VERSIONSCRIPT_FALSE!$VERSIONSCRIPT_FALSE$ac_delim

 GPERF!$GPERF$ac_delim

 LCHECK!$LCHECK$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

+ENABLE_UT_INSTALL_FALSE!$ENABLE_UT_INSTALL_FALSE$ac_delim

+GCOV!$GCOV$ac_delim

+LCOV!$LCOV$ac_delim

+GENHTML!$GENHTML$ac_delim

 MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim

 MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim

 MAINT!$MAINT$ac_delim

@@ -20220,7 +20419,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` = 37; then

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

     break

   elif $ac_last_try; then

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

@@ -317,26 +317,55 @@ AC_CHECK_FUNCS([poll setsid memcpy snprintf vsnprintf strerror_r strlcpy strlcat

 AC_FUNC_MMAP

 AC_FUNC_FSEEKO

-enable_check_ut=no

+enable_check_ut=auto

+enable_ut_install=no

 AC_ARG_ENABLE(check,

-[  --enable-check           Enable 'check' unit tests], enable_check_ut=yes, )

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

 LCHECK=""

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

-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="-lcheck", LCHECK="no")

+    AC_CHECK_HEADER(check.h,

+	[

+		AC_CHECK_LIB(check, srunner_create,

+			[

+				LCHECK="-lcheck";

+				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"])

 fi

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

+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

 AC_SUBST(LCHECK)

+AC_ARG_ENABLE(coverage,

+	      AC_HELP_STRING([--enable-coverage],

+			     [turn on test coverage

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

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

+

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

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

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

+	fi

+

+	CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage"

+	LDFLAGS="$LDFLAGS -lgcov"

+fi

+

+AM_CONDITIONAL(ENABLE_COVERAGE, test "x$enable_coverage" = "xyes")

+AM_CONDITIONAL(ENABLE_UT_INSTALL, test "x$enable_ut_install" = "xyes")

+AC_CHECK_PROGS(GCOV, gcov, false)

+AC_CHECK_PROGS(LCOV, lcov, false)

+AC_CHECK_PROGS(GENHTML, genhtml, false)

 have_pthreads=no

 AC_CHECK_HEADER([pthread.h],[have_pthreads=yes],)

@@ -95,6 +95,8 @@ ECHO_T = @ECHO_T@

 EGREP = @EGREP@

 EXEEXT = @EXEEXT@

 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@

+GCOV = @GCOV@

+GENHTML = @GENHTML@

 GETENT = @GETENT@

 GPERF = @GPERF@

 GREP = @GREP@

@@ -105,6 +107,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@

 INSTALL_SCRIPT = @INSTALL_SCRIPT@

 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

 LCHECK = @LCHECK@

+LCOV = @LCOV@

 LDFLAGS = @LDFLAGS@

 LIBBZ2 = @LIBBZ2@

 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@

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

 EGREP = @EGREP@

 EXEEXT = @EXEEXT@

 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@

+GCOV = @GCOV@

+GENHTML = @GENHTML@

 GETENT = @GETENT@

 GPERF = @GPERF@

 GREP = @GREP@

@@ -110,6 +112,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@

 INSTALL_SCRIPT = @INSTALL_SCRIPT@

 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

 LCHECK = @LCHECK@

+LCOV = @LCOV@

 LDFLAGS = @LDFLAGS@

 LIBBZ2 = @LIBBZ2@

 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@

@@ -93,6 +93,8 @@ ECHO_T = @ECHO_T@

 EGREP = @EGREP@

 EXEEXT = @EXEEXT@

 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@

+GCOV = @GCOV@

+GENHTML = @GENHTML@

 GETENT = @GETENT@

 GPERF = @GPERF@

 GREP = @GREP@

@@ -103,6 +105,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@

 INSTALL_SCRIPT = @INSTALL_SCRIPT@

 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

 LCHECK = @LCHECK@

+LCOV = @LCOV@

 LDFLAGS = @LDFLAGS@

 LIBBZ2 = @LIBBZ2@

 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@

@@ -121,6 +121,8 @@ ECHO_T = @ECHO_T@

 EGREP = @EGREP@

 EXEEXT = @EXEEXT@

 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@

+GCOV = @GCOV@

+GENHTML = @GENHTML@

 GETENT = @GETENT@

 GPERF = @GPERF@

 GREP = @GREP@

@@ -131,6 +133,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@

 INSTALL_SCRIPT = @INSTALL_SCRIPT@

 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

 LCHECK = @LCHECK@

+LCOV = @LCOV@

 LDFLAGS = @LDFLAGS@

 LIBBZ2 = @LIBBZ2@

 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@

@@ -164,6 +164,8 @@ ECHO_T = @ECHO_T@

 EGREP = @EGREP@

 EXEEXT = @EXEEXT@

 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@

+GCOV = @GCOV@

+GENHTML = @GENHTML@

 GETENT = @GETENT@

 GPERF = @GPERF@

 GREP = @GREP@

@@ -174,6 +176,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@

 INSTALL_SCRIPT = @INSTALL_SCRIPT@

 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

 LCHECK = @LCHECK@

+LCOV = @LCOV@

 LDFLAGS = @LDFLAGS@

 LIBBZ2 = @LIBBZ2@

 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@

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

 EGREP = @EGREP@

 EXEEXT = @EXEEXT@

 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@

+GCOV = @GCOV@

+GENHTML = @GENHTML@

 GETENT = @GETENT@

 GPERF = @GPERF@

 GREP = @GREP@

@@ -123,6 +125,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@

 INSTALL_SCRIPT = @INSTALL_SCRIPT@

 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

 LCHECK = @LCHECK@

+LCOV = @LCOV@

 LDFLAGS = @LDFLAGS@

 LIBBZ2 = @LIBBZ2@

 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@

@@ -117,6 +117,8 @@ ECHO_T = @ECHO_T@

 EGREP = @EGREP@

 EXEEXT = @EXEEXT@

 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@

+GCOV = @GCOV@

+GENHTML = @GENHTML@

 GETENT = @GETENT@

 GPERF = @GPERF@

 GREP = @GREP@

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

 INSTALL_SCRIPT = @INSTALL_SCRIPT@

 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

 LCHECK = @LCHECK@

+LCOV = @LCOV@

 LDFLAGS = @LDFLAGS@

 LIBBZ2 = @LIBBZ2@

 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@

@@ -112,6 +112,8 @@ ECHO_T = @ECHO_T@

 EGREP = @EGREP@

 EXEEXT = @EXEEXT@

 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@

+GCOV = @GCOV@

+GENHTML = @GENHTML@

 GETENT = @GETENT@

 GPERF = @GPERF@

 GREP = @GREP@

@@ -122,6 +124,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@

 INSTALL_SCRIPT = @INSTALL_SCRIPT@

 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

 LCHECK = @LCHECK@

+LCOV = @LCOV@

 LDFLAGS = @LDFLAGS@

 LIBBZ2 = @LIBBZ2@

 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@

@@ -120,6 +120,8 @@ ECHO_T = @ECHO_T@

 EGREP = @EGREP@

 EXEEXT = @EXEEXT@

 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@

+GCOV = @GCOV@

+GENHTML = @GENHTML@

 GETENT = @GETENT@

 GPERF = @GPERF@

 GREP = @GREP@

@@ -130,6 +132,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@

 INSTALL_SCRIPT = @INSTALL_SCRIPT@

 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

 LCHECK = @LCHECK@

+LCOV = @LCOV@

 LDFLAGS = @LDFLAGS@

 LIBBZ2 = @LIBBZ2@

 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@

@@ -75,6 +75,8 @@ ECHO_T = @ECHO_T@

 EGREP = @EGREP@

 EXEEXT = @EXEEXT@

 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@

+GCOV = @GCOV@

+GENHTML = @GENHTML@

 GETENT = @GETENT@

 GPERF = @GPERF@

 GREP = @GREP@

@@ -85,6 +87,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@

 INSTALL_SCRIPT = @INSTALL_SCRIPT@

 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

 LCHECK = @LCHECK@

+LCOV = @LCOV@

 LDFLAGS = @LDFLAGS@

 LIBBZ2 = @LIBBZ2@

 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@

@@ -1,5 +1,40 @@

-TESTS = check_clamav

-bin_PROGRAMS = check_clamav