From 15d67313c4130f9cc886ac9af070aa580cf4b520 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=B6r=C3=B6k=20Edvin?= Date: Thu, 11 Sep 2008 11:02:12 +0000 Subject: [PATCH] allow 'make check' to work even if check is not installed by skipping checks that require it. (bb #1157) if configure is not able to find check, you can use --with-libcheck-prefix, instead of CHECK_CFLAGS and CHECK_LIBS. remove accidental AC_DEFINE GETHOSTBYNAME_R_6 from last commit. git-svn: trunk@4172 --- ChangeLog | 8 + Makefile.in | 3 +- aclocal.m4 | 158 ----- clamav-config.h.in | 6 +- clamav-milter/Makefile.in | 3 +- clamconf/Makefile.in | 3 +- clamd/Makefile.in | 3 +- clamdscan/Makefile.in | 3 +- clamscan/Makefile.in | 3 +- config/ltmain.sh | 0 configure | 1150 +++++++++++++++++++------------- configure.in | 40 +- database/Makefile.in | 3 +- docs/Makefile.in | 3 +- etc/Makefile.in | 3 +- freshclam/Makefile.in | 3 +- libclamav/Makefile.in | 3 +- libclamav/lzma/Makefile.in | 3 +- libclamunrar/Makefile.in | 3 +- libclamunrar_iface/Makefile.in | 3 +- m4/acinclude.m4 | 48 ++ sigtool/Makefile.in | 3 +- test/Makefile.in | 3 +- unit_tests/Makefile.am | 14 +- unit_tests/Makefile.in | 248 +++---- unit_tests/check_clamav.c | 11 - unit_tests/check_clamav_skip.c | 7 + unit_tests/check_disasm.c | 3 - unit_tests/check_jsnorm.c | 2 - unit_tests/check_matchers.c | 3 - unit_tests/check_regex.c | 2 - unit_tests/check_str.c | 3 +- unit_tests/check_uniq.c | 4 - 33 files changed, 871 insertions(+), 884 deletions(-) mode change 100644 => 100755 config/ltmain.sh create mode 100644 unit_tests/check_clamav_skip.c diff --git a/ChangeLog b/ChangeLog index 9d5b64c39..6db9cff1f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Thu Sep 11 13:16:22 EEST 2008 (edwin) +------------------------------------- + * build system: allow 'make check' to work even if check is not installed + by skipping checks that require it. (bb #1157) + if configure is not able to find check, you can use + --with-libcheck-prefix, instead of CHECK_CFLAGS and + CHECK_LIBS. + Wed Sep 10 20:05:27 CEST 2008 (tk) ---------------------------------- * configure: use getaddrinfo() whenever available (can be disabled diff --git a/Makefile.in b/Makefile.in index 6f29392dc..80ec6e56f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -134,7 +134,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFGDIR = @CFGDIR@ CFLAGS = @CFLAGS@ -CHECK_CFLAGS = @CHECK_CFLAGS@ +CHECK_CPPFLAGS = @CHECK_CPPFLAGS@ CHECK_LIBS = @CHECK_LIBS@ CLAMAVGROUP = @CLAMAVGROUP@ CLAMAVUSER = @CLAMAVUSER@ @@ -199,7 +199,6 @@ 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@ diff --git a/aclocal.m4 b/aclocal.m4 index e57ecc47f..d39057d0a 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -6782,164 +6782,6 @@ AC_SUBST([SED]) AC_MSG_RESULT([$SED]) ]) -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# -# Copyright © 2004 Scott James Remnant . -# -# 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 .])], - [$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 diff --git a/clamav-config.h.in b/clamav-config.h.in index c12f0e28e..2b9bde76c 100644 --- a/clamav-config.h.in +++ b/clamav-config.h.in @@ -105,9 +105,6 @@ /* have bzip2 */ #undef HAVE_BZLIB_H -/* Enable 'check' unit tests */ -#undef HAVE_CHECK - /* ancillary data style fd pass */ #undef HAVE_CONTROL_IN_MSGHDR @@ -162,6 +159,9 @@ /* in_port_t is defined */ #undef HAVE_IN_PORT_T +/* Define to '1' if you have the check.h library */ +#undef HAVE_LIBCHECK + /* Define if you have the gmp library. */ #undef HAVE_LIBGMP diff --git a/clamav-milter/Makefile.in b/clamav-milter/Makefile.in index b9ea76961..17c790690 100644 --- a/clamav-milter/Makefile.in +++ b/clamav-milter/Makefile.in @@ -117,7 +117,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFGDIR = @CFGDIR@ CFLAGS = `echo "@CFLAGS@" | sed -e 's/-Werror[^-]//'` -CHECK_CFLAGS = @CHECK_CFLAGS@ +CHECK_CPPFLAGS = @CHECK_CPPFLAGS@ CHECK_LIBS = @CHECK_LIBS@ CLAMAVGROUP = @CLAMAVGROUP@ CLAMAVUSER = @CLAMAVUSER@ @@ -182,7 +182,6 @@ 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@ diff --git a/clamconf/Makefile.in b/clamconf/Makefile.in index 60a7416fd..a10d669ef 100644 --- a/clamconf/Makefile.in +++ b/clamconf/Makefile.in @@ -102,7 +102,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFGDIR = @CFGDIR@ CFLAGS = @CFLAGS@ -CHECK_CFLAGS = @CHECK_CFLAGS@ +CHECK_CPPFLAGS = @CHECK_CPPFLAGS@ CHECK_LIBS = @CHECK_LIBS@ CLAMAVGROUP = @CLAMAVGROUP@ CLAMAVUSER = @CLAMAVUSER@ @@ -167,7 +167,6 @@ 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@ diff --git a/clamd/Makefile.in b/clamd/Makefile.in index 75e852cac..4c7ad5b71 100644 --- a/clamd/Makefile.in +++ b/clamd/Makefile.in @@ -122,7 +122,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFGDIR = @CFGDIR@ CFLAGS = @CFLAGS@ -CHECK_CFLAGS = @CHECK_CFLAGS@ +CHECK_CPPFLAGS = @CHECK_CPPFLAGS@ CHECK_LIBS = @CHECK_LIBS@ CLAMAVGROUP = @CLAMAVGROUP@ CLAMAVUSER = @CLAMAVUSER@ @@ -187,7 +187,6 @@ 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@ diff --git a/clamdscan/Makefile.in b/clamdscan/Makefile.in index bb2199b35..3492c1641 100644 --- a/clamdscan/Makefile.in +++ b/clamdscan/Makefile.in @@ -113,7 +113,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFGDIR = @CFGDIR@ CFLAGS = @CFLAGS@ -CHECK_CFLAGS = @CHECK_CFLAGS@ +CHECK_CPPFLAGS = @CHECK_CPPFLAGS@ CHECK_LIBS = @CHECK_LIBS@ CLAMAVGROUP = @CLAMAVGROUP@ CLAMAVUSER = @CLAMAVUSER@ @@ -178,7 +178,6 @@ 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@ diff --git a/clamscan/Makefile.in b/clamscan/Makefile.in index 62f0bfe27..dec95e206 100644 --- a/clamscan/Makefile.in +++ b/clamscan/Makefile.in @@ -104,7 +104,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFGDIR = @CFGDIR@ CFLAGS = @CFLAGS@ -CHECK_CFLAGS = @CHECK_CFLAGS@ +CHECK_CPPFLAGS = @CHECK_CPPFLAGS@ CHECK_LIBS = @CHECK_LIBS@ CLAMAVGROUP = @CLAMAVGROUP@ CLAMAVUSER = @CLAMAVUSER@ @@ -169,7 +169,6 @@ 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@ diff --git a/config/ltmain.sh b/config/ltmain.sh old mode 100644 new mode 100755 diff --git a/configure b/configure index fdd039c93..3d8fd5994 100755 --- a/configure +++ b/configure @@ -876,16 +876,15 @@ VERSIONSCRIPTFLAG VERSIONSCRIPT_TRUE VERSIONSCRIPT_FALSE GPERF -PKG_CONFIG -CHECK_CFLAGS +CHECK_CPPFLAGS CHECK_LIBS +HAVE_LIBCHECK_TRUE +HAVE_LIBCHECK_FALSE GCOV LCOV GENHTML ENABLE_COVERAGE_TRUE ENABLE_COVERAGE_FALSE -ENABLE_UT_INSTALL_TRUE -ENABLE_UT_INSTALL_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT @@ -925,10 +924,7 @@ CFLAGS LDFLAGS LIBS CPPFLAGS -CPP -PKG_CONFIG -CHECK_CFLAGS -CHECK_LIBS' +CPP' # Initialize some variables set by options. @@ -1519,13 +1515,12 @@ Optional Features: --disable-gcc-vcheck do not check for buggy gcc version --enable-experimental enable experimental code --enable-check Enable 'check' unit tests (default=auto) - --enable-tests-install install unit tests [default=no] + --disable-rpath do not hardcode runtime library paths --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 --disable-bzip2 disable bzip2 support - --disable-rpath do not hardcode runtime library paths --disable-unrar don't build libclamunrar and libclamunrar_iface --disable-getaddrinfo disable support for getaddrinfo --disable-ipv6 disable IPv6 support @@ -1554,9 +1549,11 @@ Optional Packages: both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-fpu-words-bigendian=(yes/no/auto) specify FPU endianess (default=auto) + --with-gnu-ld assume the C compiler uses GNU ld default=no + --with-libcheck-prefix[=DIR] search for libcheck in DIR/include and DIR/lib + --without-libcheck-prefix don't search for libcheck in includedir and libdir --with-zlib=DIR path to directory containing zlib library (default= /usr/local or /usr if not found in /usr/local) - --with-gnu-ld assume the C compiler uses GNU ld default=no --with-libbz2-prefix[=DIR] search for libbz2 in DIR/include and DIR/lib --without-libbz2-prefix don't search for libbz2 in includedir and libdir --with-libgmp-prefix[=DIR] search for libgmp in DIR/include and DIR/lib @@ -1578,10 +1575,6 @@ Some influential environment variables: CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if you have headers in a nonstandard directory 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. @@ -4760,13 +4753,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:4763: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4756: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4766: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4759: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4769: output\"" >&5) + (eval echo "\"\$as_me:4762: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5977,7 +5970,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5980 "configure"' > conftest.$ac_ext + echo '#line 5973 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7828,11 +7821,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:7831: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7824: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7835: \$? = $ac_status" >&5 + echo "$as_me:7828: \$? = $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. @@ -8167,11 +8160,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:8170: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8163: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8174: \$? = $ac_status" >&5 + echo "$as_me:8167: \$? = $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. @@ -8272,11 +8265,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:8275: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8268: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8279: \$? = $ac_status" >&5 + echo "$as_me:8272: \$? = $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 @@ -8327,11 +8320,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:8330: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8323: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8334: \$? = $ac_status" >&5 + echo "$as_me:8327: \$? = $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 @@ -11083,7 +11076,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11086 "configure" +#line 11079 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11179,7 +11172,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11182 "configure" +#line 11175 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13771,223 +13764,639 @@ fi if test "$enable_check_ut" != "no" ; 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 + if test "X$prefix" = "XNONE"; then + acl_final_prefix="$ac_default_prefix" + else + acl_final_prefix="$prefix" fi -done -done -IFS=$as_save_IFS + if test "X$exec_prefix" = "XNONE"; then + acl_final_exec_prefix='${prefix}' + else + acl_final_exec_prefix="$exec_prefix" + fi + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" + prefix="$acl_save_prefix" - ;; -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; } + +# Check whether --with-gnu-ld was given. +if test "${with_gnu_ld+set}" = set; then + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + with_gnu_ld=no fi - +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh 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 +ac_prog=ld +if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + { echo "$as_me:$LINENO: checking for ld used by GCC" >&5 +echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6; } + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $ac_prog in + # Accept absolute paths. + [\\/]* | [A-Za-z]:[\\/]*) + re_direlt='/[^/][^/]*/\.\./' + # Canonicalize the path of ld + ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` + while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do + ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` + done + test -z "$LD" && LD="$ac_prog" + ;; + "") + # If it fails, then pretend we aren't using GCC. + ac_prog=ld + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac +elif test "$with_gnu_ld" = yes; then + { echo "$as_me:$LINENO: checking for GNU ld" >&5 +echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } +else + { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 +echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } +fi +if test "${acl_cv_path_LD+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 + if test -z "$LD"; then + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + acl_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some GNU ld's only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in + *GNU* | *'with BFD'*) + test "$with_gnu_ld" != no && break ;; + *) + test "$with_gnu_ld" != yes && break ;; + esac + fi + done + IFS="$ac_save_ifs" +else + acl_cv_path_LD="$LD" # Let the user override the test with a path. 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; } +fi + +LD="$acl_cv_path_LD" +if test -n "$LD"; then + { echo "$as_me:$LINENO: result: $LD" >&5 +echo "${ECHO_T}$LD" >&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 +test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 +echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} + { (exit 1); exit 1; }; } +{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } +if test "${acl_cv_prog_gnu_ld+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - PKG_CONFIG="$ac_cv_path_PKG_CONFIG" + # I'd rather use --version here, but apparently some GNU ld's only accept -v. +case `$LD -v 2>&1 &5 +echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6; } +with_gnu_ld=$acl_cv_prog_gnu_ld -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` + { echo "$as_me:$LINENO: checking for shared library run path origin" >&5 +echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6; } +if test "${acl_cv_rpath+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - pkg_failed=yes + + CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ + ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh + . ./conftest.sh + rm -f ./conftest.sh + acl_cv_rpath=done + fi - fi +{ echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5 +echo "${ECHO_T}$acl_cv_rpath" >&6; } + wl="$acl_cv_wl" + acl_libext="$acl_cv_libext" + acl_shlibext="$acl_cv_shlibext" + acl_libname_spec="$acl_cv_libname_spec" + acl_library_names_spec="$acl_cv_library_names_spec" + acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" + acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" + acl_hardcode_direct="$acl_cv_hardcode_direct" + acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" + # Check whether --enable-rpath was given. +if test "${enable_rpath+set}" = set; then + enableval=$enable_rpath; : else - pkg_failed=untried + enable_rpath=yes fi -if test $pkg_failed = yes; then + acl_libdirstem=lib + searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` + if test -n "$searchpath"; then + acl_save_IFS="${IFS= }"; IFS=":" + for searchdir in $searchpath; do + if test -d "$searchdir"; then + case "$searchdir" in + */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; + *) searchdir=`cd "$searchdir" && pwd` + case "$searchdir" in + */lib64 ) acl_libdirstem=lib64 ;; + esac ;; + esac + fi + done + IFS="$acl_save_IFS" + fi + + + + -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes + + { echo "$as_me:$LINENO: checking how to compile and link with check" >&5 +echo $ECHO_N "checking how to compile and link with check... $ECHO_C" >&6; } +if test "${ac_cv_findlib_CHECK_libs+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 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: unable to find 'check' using pkg-config: -$CHECK_PKG_ERRORS -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: unable to find 'check' using pkg-config: -$CHECK_PKG_ERRORS -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: unable to find 'check' using pkg-config: -$CHECK_PKG_ERRORS -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: unable to find 'check' using pkg-config: -$CHECK_PKG_ERRORS -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" - if test -z "$CHECK_LIBS"; then - # when pkg-config is not available, use defaults - CHECK_LIBS="-lcheck" - fi - LIBS="$LIBS $CHECK_LIBS" - if test "${ac_cv_header_check_h+set}" = set; then + save_CPPFLAGS="$CPPFLAGS" + save_LIBS="$LIBS" + + + + + use_additional=yes + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + +# Check whether --with-libcheck-prefix was given. +if test "${with_libcheck_prefix+set}" = set; then + withval=$with_libcheck_prefix; + if test "X$withval" = "Xno"; then + use_additional=no + else + if test "X$withval" = "X"; then + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + else + additional_includedir="$withval/include" + additional_libdir="$withval/$acl_libdirstem" + fi + fi + +fi + + LIBCHECK= + LTLIBCHECK= + INCCHECK= + LIBCHECK_PREFIX= + rpathdirs= + ltrpathdirs= + names_already_handled= + names_next_round='check ' + while test -n "$names_next_round"; do + names_this_round="$names_next_round" + names_next_round= + for name in $names_this_round; do + already_handled= + for n in $names_already_handled; do + if test "$n" = "$name"; then + already_handled=yes + break + fi + done + if test -z "$already_handled"; then + names_already_handled="$names_already_handled $name" + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` + eval value=\"\$HAVE_LIB$uppername\" + if test -n "$value"; then + if test "$value" = yes; then + eval value=\"\$LIB$uppername\" + test -z "$value" || LIBCHECK="${LIBCHECK}${LIBCHECK:+ }$value" + eval value=\"\$LTLIB$uppername\" + test -z "$value" || LTLIBCHECK="${LTLIBCHECK}${LTLIBCHECK:+ }$value" + else + : + fi + else + found_dir= + found_la= + found_so= + found_a= + eval libname=\"$acl_libname_spec\" # typically: libname=lib$name + if test -n "$acl_shlibext"; then + shrext=".$acl_shlibext" # typically: shrext=.so + else + shrext= + fi + if test $use_additional = yes; then + dir="$additional_libdir" + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" + else + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi + fi + fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" + fi + fi + fi + if test "X$found_dir" = "X"; then + for x in $LDFLAGS $LTLIBCHECK; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + case "$x" in + -L*) + dir=`echo "X$x" | sed -e 's/^X-L//'` + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" + else + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi + fi + fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" + fi + fi + ;; + esac + if test "X$found_dir" != "X"; then + break + fi + done + fi + if test "X$found_dir" != "X"; then + LTLIBCHECK="${LTLIBCHECK}${LTLIBCHECK:+ }-L$found_dir -l$name" + if test "X$found_so" != "X"; then + if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then + LIBCHECK="${LIBCHECK}${LIBCHECK:+ }$found_so" + else + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $found_dir" + fi + if test "$acl_hardcode_direct" = yes; then + LIBCHECK="${LIBCHECK}${LIBCHECK:+ }$found_so" + else + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then + LIBCHECK="${LIBCHECK}${LIBCHECK:+ }$found_so" + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $found_dir" + fi + else + haveit= + for x in $LDFLAGS $LIBCHECK; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-L$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + LIBCHECK="${LIBCHECK}${LIBCHECK:+ }-L$found_dir" + fi + if test "$acl_hardcode_minus_L" != no; then + LIBCHECK="${LIBCHECK}${LIBCHECK:+ }$found_so" + else + LIBCHECK="${LIBCHECK}${LIBCHECK:+ }-l$name" + fi + fi + fi + fi + else + if test "X$found_a" != "X"; then + LIBCHECK="${LIBCHECK}${LIBCHECK:+ }$found_a" + else + LIBCHECK="${LIBCHECK}${LIBCHECK:+ }-L$found_dir -l$name" + fi + fi + additional_includedir= + case "$found_dir" in + */$acl_libdirstem | */$acl_libdirstem/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` + LIBCHECK_PREFIX="$basedir" + additional_includedir="$basedir/include" + ;; + esac + if test "X$additional_includedir" != "X"; then + if test "X$additional_includedir" != "X/usr/include"; then + haveit= + if test "X$additional_includedir" = "X/usr/local/include"; then + if test -n "$GCC"; then + case $host_os in + linux* | gnu* | k*bsd*-gnu) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + for x in $CPPFLAGS $INCCHECK; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-I$additional_includedir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_includedir"; then + INCCHECK="${INCCHECK}${INCCHECK:+ }-I$additional_includedir" + fi + fi + fi + fi + fi + if test -n "$found_la"; then + save_libdir="$libdir" + case "$found_la" in + */* | *\\*) . "$found_la" ;; + *) . "./$found_la" ;; + esac + libdir="$save_libdir" + for dep in $dependency_libs; do + case "$dep" in + -L*) + additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` + if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then + haveit= + if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then + if test -n "$GCC"; then + case $host_os in + linux* | gnu* | k*bsd*-gnu) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + haveit= + for x in $LDFLAGS $LIBCHECK; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + LIBCHECK="${LIBCHECK}${LIBCHECK:+ }-L$additional_libdir" + fi + fi + haveit= + for x in $LDFLAGS $LTLIBCHECK; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + LTLIBCHECK="${LTLIBCHECK}${LTLIBCHECK:+ }-L$additional_libdir" + fi + fi + fi + fi + ;; + -R*) + dir=`echo "X$dep" | sed -e 's/^X-R//'` + if test "$enable_rpath" != no; then + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $dir" + fi + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $dir" + fi + fi + ;; + -l*) + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` + ;; + *.la) + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` + ;; + *) + LIBCHECK="${LIBCHECK}${LIBCHECK:+ }$dep" + LTLIBCHECK="${LTLIBCHECK}${LTLIBCHECK:+ }$dep" + ;; + esac + done + fi + else + LIBCHECK="${LIBCHECK}${LIBCHECK:+ }-l$name" + LTLIBCHECK="${LTLIBCHECK}${LTLIBCHECK:+ }-l$name" + fi + fi + fi + done + done + if test "X$rpathdirs" != "X"; then + if test -n "$acl_hardcode_libdir_separator"; then + alldirs= + for found_dir in $rpathdirs; do + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" + done + acl_save_libdir="$libdir" + libdir="$alldirs" + eval flag=\"$acl_hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + LIBCHECK="${LIBCHECK}${LIBCHECK:+ }$flag" + else + for found_dir in $rpathdirs; do + acl_save_libdir="$libdir" + libdir="$found_dir" + eval flag=\"$acl_hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + LIBCHECK="${LIBCHECK}${LIBCHECK:+ }$flag" + done + fi + fi + if test "X$ltrpathdirs" != "X"; then + for found_dir in $ltrpathdirs; do + LTLIBCHECK="${LTLIBCHECK}${LTLIBCHECK:+ }-R$found_dir" + done + fi + + CPPFLAGS="$CPPFLAGS $INCCHECK" + 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 @@ -14118,7 +14527,17 @@ echo "${ECHO_T}$ac_cv_header_check_h" >&6; } fi if test $ac_cv_header_check_h = yes; then + have_header=yes +else + have_header=no +fi + + ac_cv_findlib_CHECK_libs= + ac_cv_findlib_CHECK_inc= + if test "$have_header" = "yes"; then + + LIBS="$LIBS $LIBCHECK" { echo "$as_me:$LINENO: checking linking with check" >&5 echo $ECHO_N "checking linking with check... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF @@ -14127,18 +14546,11 @@ _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 srunner_create (); +#include int main () { -return srunner_create (); +srunner_create(0) ; return 0; } @@ -14162,27 +14574,13 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - { 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. -if test "${enable_tests_install+set}" = set; then - enableval=$enable_tests_install; enable_ut_install=$enableval -else - enable_ut_install="no" -fi - + ac_cv_findlib_CHECK_libs="$LIBCHECK" + ac_cv_findlib_CHECK_inc="$INCCHECK" else 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= fi @@ -14191,27 +14589,53 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ fi + CPPFLAGS="$save_CPPFLAGS" + LIBS="$save_CPPFLAGS" - LIBS="$save_LIBS" - CPPFLAGS="$save_CPPFLAGS" fi +{ echo "$as_me:$LINENO: result: $ac_cv_findlib_CHECK_libs" >&5 +echo "${ECHO_T}$ac_cv_findlib_CHECK_libs" >&6; } + if test "X$ac_cv_findlib_CHECK_libs" = "X"; then + + { echo "$as_me:$LINENO: unable to compile/link with check" >&5 +echo "$as_me: unable to compile/link with check" >&6;} + HAVE_LIBCHECK=no + + +else + + { echo "$as_me:$LINENO: Compiling and linking with check by using $ac_cv_findlib_CHECK_inc $ac_cv_findlib_CHECK_libs" >&5 +echo "$as_me: Compiling and linking with check by using $ac_cv_findlib_CHECK_inc $ac_cv_findlib_CHECK_libs" >&6;} + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBCHECK 1 +_ACEOF + + HAVE_LIBCHECK=yes + CHECK_CPPFLAGS="$INCCHECK"; CHECK_LIBS="$LTLIBCHECK" + +fi + + + +fi + + + if test "X$HAVE_LIBCHECK" = "Xyes"; then + HAVE_LIBCHECK_TRUE= + HAVE_LIBCHECK_FALSE='#' +else + HAVE_LIBCHECK_TRUE='#' + HAVE_LIBCHECK_FALSE= +fi + if test "x$CHECK_LIBS" = "x" -a "$enable_check_ut" = "yes"; then { { echo "$as_me:$LINENO: error: -$CHECK_PKG_ERRORS - -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. ERROR! Check was configured, but not found. Get it from http://check.sf.net/ " >&5 echo "$as_me: error: -$CHECK_PKG_ERRORS - -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. ERROR! Check was configured, but not found. Get it from http://check.sf.net/ " >&2;} @@ -14379,14 +14803,6 @@ else 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 - have_pthreads=no if test "${ac_cv_header_pthread_h+set}" = set; then @@ -14925,190 +15341,6 @@ fi if test "$want_bzip2" = "yes" then - if test "X$prefix" = "XNONE"; then - acl_final_prefix="$ac_default_prefix" - else - acl_final_prefix="$prefix" - fi - if test "X$exec_prefix" = "XNONE"; then - acl_final_exec_prefix='${prefix}' - else - acl_final_exec_prefix="$exec_prefix" - fi - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" - prefix="$acl_save_prefix" - - -# Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes -else - with_gnu_ld=no -fi - -# Prepare PATH_SEPARATOR. -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - { echo "$as_me:$LINENO: checking for ld used by GCC" >&5 -echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6; } - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [\\/]* | [A-Za-z]:[\\/]*) - re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the path of ld - ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - { echo "$as_me:$LINENO: checking for GNU ld" >&5 -echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } -else - { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } -fi -if test "${acl_cv_path_LD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -z "$LD"; then - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - acl_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in - *GNU* | *'with BFD'*) - test "$with_gnu_ld" != no && break ;; - *) - test "$with_gnu_ld" != yes && break ;; - esac - fi - done - IFS="$ac_save_ifs" -else - acl_cv_path_LD="$LD" # Let the user override the test with a path. -fi -fi - -LD="$acl_cv_path_LD" -if test -n "$LD"; then - { echo "$as_me:$LINENO: result: $LD" >&5 -echo "${ECHO_T}$LD" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi -test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 -echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} - { (exit 1); exit 1; }; } -{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } -if test "${acl_cv_prog_gnu_ld+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # I'd rather use --version here, but apparently some GNU ld's only accept -v. -case `$LD -v 2>&1 &5 -echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6; } -with_gnu_ld=$acl_cv_prog_gnu_ld - - - - - { echo "$as_me:$LINENO: checking for shared library run path origin" >&5 -echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6; } -if test "${acl_cv_rpath+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ - ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh - . ./conftest.sh - rm -f ./conftest.sh - acl_cv_rpath=done - -fi -{ echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5 -echo "${ECHO_T}$acl_cv_rpath" >&6; } - wl="$acl_cv_wl" - acl_libext="$acl_cv_libext" - acl_shlibext="$acl_cv_shlibext" - acl_libname_spec="$acl_cv_libname_spec" - acl_library_names_spec="$acl_cv_library_names_spec" - acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" - acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" - acl_hardcode_direct="$acl_cv_hardcode_direct" - acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" - # Check whether --enable-rpath was given. -if test "${enable_rpath+set}" = set; then - enableval=$enable_rpath; : -else - enable_rpath=yes -fi - - - - acl_libdirstem=lib - searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` - if test -n "$searchpath"; then - acl_save_IFS="${IFS= }"; IFS=":" - for searchdir in $searchpath; do - if test -d "$searchdir"; then - case "$searchdir" in - */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; - *) searchdir=`cd "$searchdir" && pwd` - case "$searchdir" in - */lib64 ) acl_libdirstem=lib64 ;; - esac ;; - esac - fi - done - IFS="$acl_save_IFS" - fi - - @@ -15965,11 +16197,6 @@ else fi - -cat >>confdefs.h <<\_ACEOF -#define HAVE_GETHOSTBYNAME_R_6 1 -_ACEOF - if test "$want_getaddrinfo" = "yes" then { echo "$as_me:$LINENO: checking for getaddrinfo" >&5 @@ -20868,17 +21095,17 @@ 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. +if test -z "${HAVE_LIBCHECK_TRUE}" && test -z "${HAVE_LIBCHECK_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"HAVE_LIBCHECK\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"ENABLE_COVERAGE\" was never defined. +echo "$as_me: error: conditional \"HAVE_LIBCHECK\" 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. +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_UT_INSTALL\" was never defined. +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 @@ -21878,16 +22105,15 @@ VERSIONSCRIPTFLAG!$VERSIONSCRIPTFLAG$ac_delim VERSIONSCRIPT_TRUE!$VERSIONSCRIPT_TRUE$ac_delim VERSIONSCRIPT_FALSE!$VERSIONSCRIPT_FALSE$ac_delim GPERF!$GPERF$ac_delim -PKG_CONFIG!$PKG_CONFIG$ac_delim -CHECK_CFLAGS!$CHECK_CFLAGS$ac_delim +CHECK_CPPFLAGS!$CHECK_CPPFLAGS$ac_delim CHECK_LIBS!$CHECK_LIBS$ac_delim +HAVE_LIBCHECK_TRUE!$HAVE_LIBCHECK_TRUE$ac_delim +HAVE_LIBCHECK_FALSE!$HAVE_LIBCHECK_FALSE$ac_delim GCOV!$GCOV$ac_delim LCOV!$LCOV$ac_delim GENHTML!$GENHTML$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 MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim MAINT!$MAINT$ac_delim @@ -21920,7 +22146,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` = 55; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 54; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/configure.in b/configure.in index ca594699c..1fb2601b6 100644 --- a/configure.in +++ b/configure.in @@ -323,41 +323,17 @@ AC_ARG_ENABLE(check, [ --enable-check Enable 'check' unit tests (default=auto)], enable_check_ut=$enableval, enable_check_ut="auto" ) if test "$enable_check_ut" != "no" ; then - PKG_CHECK_MODULES([CHECK],[check],[], [AC_MSG_WARN([unable to find 'check' using pkg-config: -$CHECK_PKG_ERRORS -_PKG_TEXT])]) - save_CPPFLAGS="$CPPFLAGS"; - CPPFLAGS="$CPPFLAGS $CHECK_CFLAGS" - save_LIBS="$LIBS" - if test -z "$CHECK_LIBS"; then - # when pkg-config is not available, use defaults - CHECK_LIBS="-lcheck" - fi - LIBS="$LIBS $CHECK_LIBS" - AC_CHECK_HEADER(check.h, - [ - 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"]) - ], - [AC_MSG_RESULT([failed]);CHECK_LIBS=] - ) - ]) - LIBS="$save_LIBS" - CPPFLAGS="$save_CPPFLAGS" + AC_LIB_FIND([check],[check.h], + AC_LANG_PROGRAM([#include ],[srunner_create(0)]), + [CHECK_CPPFLAGS="$INCCHECK"; CHECK_LIBS="$LTLIBCHECK"], + []) fi +AC_SUBST([CHECK_CPPFLAGS]) +AC_SUBST([CHECK_LIBS]) +AM_CONDITIONAL([HAVE_LIBCHECK],test "X$HAVE_LIBCHECK" = "Xyes") if test "x$CHECK_LIBS" = "x" -a "$enable_check_ut" = "yes"; then AC_MSG_ERROR([ -$CHECK_PKG_ERRORS - -_PKG_TEXT ERROR! Check was configured, but not found. Get it from http://check.sf.net/ ]) @@ -385,7 +361,6 @@ if test "x$enable_coverage" = "xyes"; then fi AM_CONDITIONAL(ENABLE_COVERAGE, test "x$enable_coverage" = "xyes") -AM_CONDITIONAL(ENABLE_UT_INSTALL, test "x$enable_ut_install" = "xyes") have_pthreads=no AC_CHECK_HEADER([pthread.h],[have_pthreads=yes],) @@ -495,7 +470,6 @@ AC_ARG_ENABLE([getaddrinfo], [ --disable-getaddrinfo disable support for getaddrinfo], want_getaddrinfo=$enableval, want_getaddrinfo="yes") - AC_DEFINE([HAVE_GETHOSTBYNAME_R_6],1,[gethostbyname_r takes 6 arguments]) if test "$want_getaddrinfo" = "yes" then AC_MSG_CHECKING([for getaddrinfo]) diff --git a/database/Makefile.in b/database/Makefile.in index 8c9c4fc1f..9dccbaad3 100644 --- a/database/Makefile.in +++ b/database/Makefile.in @@ -80,7 +80,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFGDIR = @CFGDIR@ CFLAGS = @CFLAGS@ -CHECK_CFLAGS = @CHECK_CFLAGS@ +CHECK_CPPFLAGS = @CHECK_CPPFLAGS@ CHECK_LIBS = @CHECK_LIBS@ CLAMAVGROUP = @CLAMAVGROUP@ CLAMAVUSER = @CLAMAVUSER@ @@ -145,7 +145,6 @@ 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@ diff --git a/docs/Makefile.in b/docs/Makefile.in index 767ee1b39..b0a7ccb6e 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -86,7 +86,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFGDIR = @CFGDIR@ CFLAGS = @CFLAGS@ -CHECK_CFLAGS = @CHECK_CFLAGS@ +CHECK_CPPFLAGS = @CHECK_CPPFLAGS@ CHECK_LIBS = @CHECK_LIBS@ CLAMAVGROUP = @CLAMAVGROUP@ CLAMAVUSER = @CLAMAVUSER@ @@ -151,7 +151,6 @@ 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@ diff --git a/etc/Makefile.in b/etc/Makefile.in index ae83a13d0..26a4c31a4 100644 --- a/etc/Makefile.in +++ b/etc/Makefile.in @@ -79,7 +79,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFGDIR = @CFGDIR@ CFLAGS = @CFLAGS@ -CHECK_CFLAGS = @CHECK_CFLAGS@ +CHECK_CPPFLAGS = @CHECK_CPPFLAGS@ CHECK_LIBS = @CHECK_LIBS@ CLAMAVGROUP = @CLAMAVGROUP@ CLAMAVUSER = @CLAMAVUSER@ @@ -144,7 +144,6 @@ 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@ diff --git a/freshclam/Makefile.in b/freshclam/Makefile.in index aaa351bc2..bb7b194c8 100644 --- a/freshclam/Makefile.in +++ b/freshclam/Makefile.in @@ -107,7 +107,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFGDIR = @CFGDIR@ CFLAGS = @CFLAGS@ -CHECK_CFLAGS = @CHECK_CFLAGS@ +CHECK_CPPFLAGS = @CHECK_CPPFLAGS@ CHECK_LIBS = @CHECK_LIBS@ CLAMAVGROUP = @CLAMAVGROUP@ CLAMAVUSER = @CLAMAVUSER@ @@ -172,7 +172,6 @@ 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@ diff --git a/libclamav/Makefile.in b/libclamav/Makefile.in index b0e0b924a..54a2e6f3a 100644 --- a/libclamav/Makefile.in +++ b/libclamav/Makefile.in @@ -151,7 +151,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFGDIR = @CFGDIR@ CFLAGS = @CFLAGS@ -CHECK_CFLAGS = @CHECK_CFLAGS@ +CHECK_CPPFLAGS = @CHECK_CPPFLAGS@ CHECK_LIBS = @CHECK_LIBS@ CLAMAVGROUP = @CLAMAVGROUP@ CLAMAVUSER = @CLAMAVUSER@ @@ -216,7 +216,6 @@ 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@ diff --git a/libclamav/lzma/Makefile.in b/libclamav/lzma/Makefile.in index 49a29371c..bf9d481df 100644 --- a/libclamav/lzma/Makefile.in +++ b/libclamav/lzma/Makefile.in @@ -99,7 +99,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFGDIR = @CFGDIR@ CFLAGS = @CFLAGS@ -CHECK_CFLAGS = @CHECK_CFLAGS@ +CHECK_CPPFLAGS = @CHECK_CPPFLAGS@ CHECK_LIBS = @CHECK_LIBS@ CLAMAVGROUP = @CLAMAVGROUP@ CLAMAVUSER = @CLAMAVUSER@ @@ -164,7 +164,6 @@ 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@ diff --git a/libclamunrar/Makefile.in b/libclamunrar/Makefile.in index 28a23c0c4..3e4333250 100644 --- a/libclamunrar/Makefile.in +++ b/libclamunrar/Makefile.in @@ -103,7 +103,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFGDIR = @CFGDIR@ CFLAGS = @CFLAGS@ -CHECK_CFLAGS = @CHECK_CFLAGS@ +CHECK_CPPFLAGS = @CHECK_CPPFLAGS@ CHECK_LIBS = @CHECK_LIBS@ CLAMAVGROUP = @CLAMAVGROUP@ CLAMAVUSER = @CLAMAVUSER@ @@ -168,7 +168,6 @@ 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@ diff --git a/libclamunrar_iface/Makefile.in b/libclamunrar_iface/Makefile.in index bac674c5e..6f12359be 100644 --- a/libclamunrar_iface/Makefile.in +++ b/libclamunrar_iface/Makefile.in @@ -98,7 +98,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFGDIR = @CFGDIR@ CFLAGS = @CFLAGS@ -CHECK_CFLAGS = @CHECK_CFLAGS@ +CHECK_CPPFLAGS = @CHECK_CPPFLAGS@ CHECK_LIBS = @CHECK_LIBS@ CLAMAVGROUP = @CLAMAVGROUP@ CLAMAVUSER = @CLAMAVUSER@ @@ -163,7 +163,6 @@ 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@ diff --git a/m4/acinclude.m4 b/m4/acinclude.m4 index 23d262862..b0e8942ae 100644 --- a/m4/acinclude.m4 +++ b/m4/acinclude.m4 @@ -688,3 +688,51 @@ LIBS="$save_LIBS" ]) ]) +dnl AC_LIB_FIND(LIBNAME, HEADER, LINKTESTCODE, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND) +dnl Checks for flags needed to link with LIBNAME, for the existence of HEADER, +dnl and the ability to link with LINKTESTCODE. +dnl If successful sets LIB${LIBNAME}, LTLIB${LIBNAME}, INC${LIBNAME} variables, +dnl AC_DEFINEs HAVE_LIB${LIBNAME} to 1, defines HAVE_LIB${LIBNAME} to yes, +dnl and evaluates ACTION-IF-FOUND. +dnl Otherwise evaluates ACTION-IF-NOT-FOUND. +dnl -------------------------------------------------------------------------------- +AC_DEFUN([AC_LIB_FIND], +[ + dnl Prerequisites of AC_LIB_LINKFLAGS_BODY + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) + AC_REQUIRE([AC_LIB_RPATH]) + m4_if($#,5,,[m4_fatal([$0: invalid number of arguments: $#])]) + define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + AC_CACHE_CHECK([how to compile and link with $1],[ac_cv_findlib_[]NAME[]_libs],[ + save_CPPFLAGS="$CPPFLAGS" + save_LIBS="$LIBS" + AC_LIB_LINKFLAGS_BODY([$1]) + CPPFLAGS="$CPPFLAGS $INC[]NAME" + AC_CHECK_HEADER([$2], [have_header=yes],[have_header=no]) + ac_cv_findlib_[]NAME[]_libs= + ac_cv_findlib_[]NAME[]_inc= + AS_IF([test "$have_header" = "yes"],[ + LIBS="$LIBS $LIB[]NAME" + AC_MSG_CHECKING([linking with $1]) + AC_LINK_IFELSE([$3],[ + ac_cv_findlib_[]NAME[]_libs="$LIB[]NAME" + ac_cv_findlib_[]NAME[]_inc="$INC[]NAME" + ]) + ]) + CPPFLAGS="$save_CPPFLAGS" + LIBS="$save_CPPFLAGS" + ]) + AS_IF([test "X$ac_cv_findlib_[]NAME[]_libs" = "X"],[ + AC_MSG_NOTICE([unable to compile/link with $1]) + HAVE_LIB[]NAME=no + $5 + ],[ + AC_MSG_NOTICE([Compiling and linking with $1 by using $ac_cv_findlib_[]NAME[]_inc $ac_cv_findlib_[]NAME[]_libs]) + AC_DEFINE([HAVE_LIB]NAME,1,[Define to '1' if you have the $2 library]) + HAVE_LIB[]NAME=yes + $4 + ]) + undefine([NAME]) +]) + diff --git a/sigtool/Makefile.in b/sigtool/Makefile.in index ba03b4bb6..e28dfa856 100644 --- a/sigtool/Makefile.in +++ b/sigtool/Makefile.in @@ -104,7 +104,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFGDIR = @CFGDIR@ CFLAGS = @CFLAGS@ -CHECK_CFLAGS = @CHECK_CFLAGS@ +CHECK_CPPFLAGS = @CHECK_CPPFLAGS@ CHECK_LIBS = @CHECK_LIBS@ CLAMAVGROUP = @CLAMAVGROUP@ CLAMAVUSER = @CLAMAVUSER@ @@ -171,7 +171,6 @@ 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@ diff --git a/test/Makefile.in b/test/Makefile.in index 77b87083d..af5a73f4e 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -61,7 +61,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFGDIR = @CFGDIR@ CFLAGS = @CFLAGS@ -CHECK_CFLAGS = @CHECK_CFLAGS@ +CHECK_CPPFLAGS = @CHECK_CPPFLAGS@ CHECK_LIBS = @CHECK_LIBS@ CLAMAVGROUP = @CLAMAVGROUP@ CLAMAVUSER = @CLAMAVUSER@ @@ -126,7 +126,6 @@ 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@ diff --git a/unit_tests/Makefile.am b/unit_tests/Makefile.am index 6a29994b0..dd2f92c94 100644 --- a/unit_tests/Makefile.am +++ b/unit_tests/Makefile.am @@ -9,16 +9,16 @@ $(FILES) : programs = check_clamav scripts = check_clamd.sh check_freshclam.sh check_sigtool.sh check_clamscan.sh valgrind_tests.sh TESTS = $(programs) $(scripts) -if ENABLE_UT_INSTALL -bin_PROGRAMS = $(programs) -dist_bin_SCRIPTS = $(scripts) -else check_PROGRAMS = $(programs) check_SCRIPTS = $(scripts) -endif + +if HAVE_LIBCHECK check_clamav_SOURCES = check_clamav.c check_jsnorm.c check_str.c check_regex.c checks.h $(top_builddir)/libclamav/clamav.h check_disasm.c check_uniq.c check_matchers.c -check_clamav_CFLAGS = @CHECK_CFLAGS@ -DSRCDIR=\"$(abs_srcdir)\" +check_clamav_CPPFLAGS = @CHECK_CPPFLAGS@ -DSRCDIR=\"$(abs_srcdir)\" check_clamav_LDADD = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@ @CHECK_LIBS@ +else +check_clamav_SOURCES = check_clamav_skip.c +endif check_clamd.sh: $(top_builddir)/test/clam.exe check_clamscan.sh: $(top_builddir)/test/clam.exe @@ -27,7 +27,7 @@ $(top_builddir)/test/clam.exe: (cd $(top_builddir)/test && $(MAKE)) CLEANFILES=lcov.out *.gcno *.gcda *.log clamd-test.socket /tmp/clamd-test.log $(FILES) test-stderr.log clamscan.log valgrind.log clamdscan.log -EXTRA_DIST=.split input test-clamd.conf test-freshclam.conf valgrind.supp virusaction-test.sh +EXTRA_DIST=.split input test-clamd.conf test-freshclam.conf valgrind.supp virusaction-test.sh $(scripts) if ENABLE_COVERAGE LCOV_OUTPUT = lcov.out LCOV_HTML = lcov_html diff --git a/unit_tests/Makefile.in b/unit_tests/Makefile.in index e18c6466a..5cb431a77 100644 --- a/unit_tests/Makefile.in +++ b/unit_tests/Makefile.in @@ -13,8 +13,6 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - - VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,11 +33,9 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ TESTS = $(am__EXEEXT_1) $(scripts) -@ENABLE_UT_INSTALL_TRUE@bin_PROGRAMS = $(am__EXEEXT_1) -@ENABLE_UT_INSTALL_FALSE@check_PROGRAMS = $(am__EXEEXT_1) +check_PROGRAMS = $(am__EXEEXT_1) subdir = unit_tests -DIST_COMMON = $(am__dist_bin_SCRIPTS_DIST) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ $(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-link.m4 \ @@ -54,25 +50,23 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/clamav-config.h CONFIG_CLEAN_FILES = am__EXEEXT_1 = check_clamav$(EXEEXT) -am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" -binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) -PROGRAMS = $(bin_PROGRAMS) -am_check_clamav_OBJECTS = check_clamav-check_clamav.$(OBJEXT) \ - check_clamav-check_jsnorm.$(OBJEXT) \ - check_clamav-check_str.$(OBJEXT) \ - check_clamav-check_regex.$(OBJEXT) \ - check_clamav-check_disasm.$(OBJEXT) \ - check_clamav-check_uniq.$(OBJEXT) \ - check_clamav-check_matchers.$(OBJEXT) +am__check_clamav_SOURCES_DIST = check_clamav_skip.c check_clamav.c \ + check_jsnorm.c check_str.c check_regex.c checks.h \ + $(top_builddir)/libclamav/clamav.h check_disasm.c check_uniq.c \ + check_matchers.c +@HAVE_LIBCHECK_FALSE@am_check_clamav_OBJECTS = \ +@HAVE_LIBCHECK_FALSE@ check_clamav-check_clamav_skip.$(OBJEXT) +@HAVE_LIBCHECK_TRUE@am_check_clamav_OBJECTS = \ +@HAVE_LIBCHECK_TRUE@ check_clamav-check_clamav.$(OBJEXT) \ +@HAVE_LIBCHECK_TRUE@ check_clamav-check_jsnorm.$(OBJEXT) \ +@HAVE_LIBCHECK_TRUE@ check_clamav-check_str.$(OBJEXT) \ +@HAVE_LIBCHECK_TRUE@ check_clamav-check_regex.$(OBJEXT) \ +@HAVE_LIBCHECK_TRUE@ check_clamav-check_disasm.$(OBJEXT) \ +@HAVE_LIBCHECK_TRUE@ check_clamav-check_uniq.$(OBJEXT) \ +@HAVE_LIBCHECK_TRUE@ check_clamav-check_matchers.$(OBJEXT) check_clamav_OBJECTS = $(am_check_clamav_OBJECTS) -check_clamav_DEPENDENCIES = $(top_builddir)/libclamav/libclamav.la -check_clamav_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(check_clamav_CFLAGS) \ - $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -am__dist_bin_SCRIPTS_DIST = check_clamd.sh check_freshclam.sh \ - check_sigtool.sh check_clamscan.sh valgrind_tests.sh -dist_binSCRIPT_INSTALL = $(INSTALL_SCRIPT) -SCRIPTS = $(dist_bin_SCRIPTS) +@HAVE_LIBCHECK_TRUE@check_clamav_DEPENDENCIES = \ +@HAVE_LIBCHECK_TRUE@ $(top_builddir)/libclamav/libclamav.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/config/depcomp am__depfiles_maybe = depfiles @@ -86,7 +80,7 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ SOURCES = $(check_clamav_SOURCES) -DIST_SOURCES = $(check_clamav_SOURCES) +DIST_SOURCES = $(am__check_clamav_SOURCES_DIST) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -101,7 +95,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFGDIR = @CFGDIR@ CFLAGS = @CFLAGS@ -CHECK_CFLAGS = @CHECK_CFLAGS@ +CHECK_CPPFLAGS = @CHECK_CPPFLAGS@ CHECK_LIBS = @CHECK_LIBS@ CLAMAVGROUP = @CLAMAVGROUP@ CLAMAVUSER = @CLAMAVUSER@ @@ -166,7 +160,6 @@ 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@ @@ -236,13 +229,13 @@ SPLIT_DIR = $(top_srcdir)/unit_tests/.split FILES = clam-phish-exe programs = check_clamav scripts = check_clamd.sh check_freshclam.sh check_sigtool.sh check_clamscan.sh valgrind_tests.sh -@ENABLE_UT_INSTALL_TRUE@dist_bin_SCRIPTS = $(scripts) -@ENABLE_UT_INSTALL_FALSE@check_SCRIPTS = $(scripts) -check_clamav_SOURCES = check_clamav.c check_jsnorm.c check_str.c check_regex.c checks.h $(top_builddir)/libclamav/clamav.h check_disasm.c check_uniq.c check_matchers.c -check_clamav_CFLAGS = @CHECK_CFLAGS@ -DSRCDIR=\"$(abs_srcdir)\" -check_clamav_LDADD = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@ @CHECK_LIBS@ +check_SCRIPTS = $(scripts) +@HAVE_LIBCHECK_FALSE@check_clamav_SOURCES = check_clamav_skip.c +@HAVE_LIBCHECK_TRUE@check_clamav_SOURCES = check_clamav.c check_jsnorm.c check_str.c check_regex.c checks.h $(top_builddir)/libclamav/clamav.h check_disasm.c check_uniq.c check_matchers.c +@HAVE_LIBCHECK_TRUE@check_clamav_CPPFLAGS = @CHECK_CPPFLAGS@ -DSRCDIR=\"$(abs_srcdir)\" +@HAVE_LIBCHECK_TRUE@check_clamav_LDADD = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@ @CHECK_LIBS@ CLEANFILES = lcov.out *.gcno *.gcda *.log clamd-test.socket /tmp/clamd-test.log $(FILES) test-stderr.log clamscan.log valgrind.log clamdscan.log -EXTRA_DIST = .split input test-clamd.conf test-freshclam.conf valgrind.supp virusaction-test.sh +EXTRA_DIST = .split input test-clamd.conf test-freshclam.conf valgrind.supp virusaction-test.sh $(scripts) @ENABLE_COVERAGE_TRUE@LCOV_OUTPUT = lcov.out @ENABLE_COVERAGE_TRUE@LCOV_HTML = lcov_html @ENABLE_COVERAGE_TRUE@LCOV_LCOV = @LCOV@ @@ -282,50 +275,6 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - if test -f $$p \ - || test -f $$p1 \ - ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ - else :; fi; \ - done - -uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ - rm -f "$(DESTDIR)$(bindir)/$$f"; \ - done - -clean-binPROGRAMS: - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f $$p $$f"; \ - rm -f $$p $$f ; \ - done - -installcheck-binPROGRAMS: $(bin_PROGRAMS) - bad=0; pid=$$$$; list="$(bin_PROGRAMS)"; for p in $$list; do \ - case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \ - *" $$p "* | *" $(srcdir)/$$p "*) continue;; \ - esac; \ - f=`echo "$$p" | \ - sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - for opt in --help --version; do \ - if "$(DESTDIR)$(bindir)/$$f" $$opt >c$${pid}_.out \ - 2>c$${pid}_.err &2; bad=1; fi; \ - done; \ - done; rm -f c$${pid}_.???; exit $$bad clean-checkPROGRAMS: @list='$(check_PROGRAMS)'; for p in $$list; do \ @@ -335,41 +284,7 @@ clean-checkPROGRAMS: done check_clamav$(EXEEXT): $(check_clamav_OBJECTS) $(check_clamav_DEPENDENCIES) @rm -f check_clamav$(EXEEXT) - $(check_clamav_LINK) $(check_clamav_OBJECTS) $(check_clamav_LDADD) $(LIBS) -install-dist_binSCRIPTS: $(dist_bin_SCRIPTS) - @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" - @list='$(dist_bin_SCRIPTS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f $$d$$p; then \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " $(dist_binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(dist_binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ - else :; fi; \ - done - -uninstall-dist_binSCRIPTS: - @$(NORMAL_UNINSTALL) - @list='$(dist_bin_SCRIPTS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ - rm -f "$(DESTDIR)$(bindir)/$$f"; \ - done - -installcheck-dist_binSCRIPTS: $(dist_bin_SCRIPTS) - bad=0; pid=$$$$; list="$(dist_bin_SCRIPTS)"; for p in $$list; do \ - case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \ - *" $$p "* | *" $(srcdir)/$$p "*) continue;; \ - esac; \ - f=`echo "$$p" | sed 's,^.*/,,;$(transform)'`; \ - for opt in --help --version; do \ - if "$(DESTDIR)$(bindir)/$$f" $$opt >c$${pid}_.out \ - 2>c$${pid}_.err &2; bad=1; fi; \ - done; \ - done; rm -f c$${pid}_.???; exit $$bad + $(LINK) $(check_clamav_OBJECTS) $(check_clamav_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -378,6 +293,7 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_clamav-check_clamav.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_clamav-check_clamav_skip.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_clamav-check_disasm.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_clamav-check_jsnorm.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_clamav-check_matchers.Po@am__quote@ @@ -406,103 +322,117 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +check_clamav-check_clamav_skip.o: check_clamav_skip.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamav_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT check_clamav-check_clamav_skip.o -MD -MP -MF $(DEPDIR)/check_clamav-check_clamav_skip.Tpo -c -o check_clamav-check_clamav_skip.o `test -f 'check_clamav_skip.c' || echo '$(srcdir)/'`check_clamav_skip.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_clamav-check_clamav_skip.Tpo $(DEPDIR)/check_clamav-check_clamav_skip.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check_clamav_skip.c' object='check_clamav-check_clamav_skip.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamav_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o check_clamav-check_clamav_skip.o `test -f 'check_clamav_skip.c' || echo '$(srcdir)/'`check_clamav_skip.c + +check_clamav-check_clamav_skip.obj: check_clamav_skip.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamav_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT check_clamav-check_clamav_skip.obj -MD -MP -MF $(DEPDIR)/check_clamav-check_clamav_skip.Tpo -c -o check_clamav-check_clamav_skip.obj `if test -f 'check_clamav_skip.c'; then $(CYGPATH_W) 'check_clamav_skip.c'; else $(CYGPATH_W) '$(srcdir)/check_clamav_skip.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_clamav-check_clamav_skip.Tpo $(DEPDIR)/check_clamav-check_clamav_skip.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check_clamav_skip.c' object='check_clamav-check_clamav_skip.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamav_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o check_clamav-check_clamav_skip.obj `if test -f 'check_clamav_skip.c'; then $(CYGPATH_W) 'check_clamav_skip.c'; else $(CYGPATH_W) '$(srcdir)/check_clamav_skip.c'; fi` + check_clamav-check_clamav.o: check_clamav.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_clamav_CFLAGS) $(CFLAGS) -MT check_clamav-check_clamav.o -MD -MP -MF $(DEPDIR)/check_clamav-check_clamav.Tpo -c -o check_clamav-check_clamav.o `test -f 'check_clamav.c' || echo '$(srcdir)/'`check_clamav.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamav_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT check_clamav-check_clamav.o -MD -MP -MF $(DEPDIR)/check_clamav-check_clamav.Tpo -c -o check_clamav-check_clamav.o `test -f 'check_clamav.c' || echo '$(srcdir)/'`check_clamav.c @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_clamav-check_clamav.Tpo $(DEPDIR)/check_clamav-check_clamav.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check_clamav.c' object='check_clamav-check_clamav.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_clamav_CFLAGS) $(CFLAGS) -c -o check_clamav-check_clamav.o `test -f 'check_clamav.c' || echo '$(srcdir)/'`check_clamav.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamav_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o check_clamav-check_clamav.o `test -f 'check_clamav.c' || echo '$(srcdir)/'`check_clamav.c check_clamav-check_clamav.obj: check_clamav.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_clamav_CFLAGS) $(CFLAGS) -MT check_clamav-check_clamav.obj -MD -MP -MF $(DEPDIR)/check_clamav-check_clamav.Tpo -c -o check_clamav-check_clamav.obj `if test -f 'check_clamav.c'; then $(CYGPATH_W) 'check_clamav.c'; else $(CYGPATH_W) '$(srcdir)/check_clamav.c'; fi` +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamav_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT check_clamav-check_clamav.obj -MD -MP -MF $(DEPDIR)/check_clamav-check_clamav.Tpo -c -o check_clamav-check_clamav.obj `if test -f 'check_clamav.c'; then $(CYGPATH_W) 'check_clamav.c'; else $(CYGPATH_W) '$(srcdir)/check_clamav.c'; fi` @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_clamav-check_clamav.Tpo $(DEPDIR)/check_clamav-check_clamav.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check_clamav.c' object='check_clamav-check_clamav.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_clamav_CFLAGS) $(CFLAGS) -c -o check_clamav-check_clamav.obj `if test -f 'check_clamav.c'; then $(CYGPATH_W) 'check_clamav.c'; else $(CYGPATH_W) '$(srcdir)/check_clamav.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamav_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o check_clamav-check_clamav.obj `if test -f 'check_clamav.c'; then $(CYGPATH_W) 'check_clamav.c'; else $(CYGPATH_W) '$(srcdir)/check_clamav.c'; fi` check_clamav-check_jsnorm.o: check_jsnorm.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_clamav_CFLAGS) $(CFLAGS) -MT check_clamav-check_jsnorm.o -MD -MP -MF $(DEPDIR)/check_clamav-check_jsnorm.Tpo -c -o check_clamav-check_jsnorm.o `test -f 'check_jsnorm.c' || echo '$(srcdir)/'`check_jsnorm.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamav_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT check_clamav-check_jsnorm.o -MD -MP -MF $(DEPDIR)/check_clamav-check_jsnorm.Tpo -c -o check_clamav-check_jsnorm.o `test -f 'check_jsnorm.c' || echo '$(srcdir)/'`check_jsnorm.c @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_clamav-check_jsnorm.Tpo $(DEPDIR)/check_clamav-check_jsnorm.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check_jsnorm.c' object='check_clamav-check_jsnorm.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_clamav_CFLAGS) $(CFLAGS) -c -o check_clamav-check_jsnorm.o `test -f 'check_jsnorm.c' || echo '$(srcdir)/'`check_jsnorm.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamav_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o check_clamav-check_jsnorm.o `test -f 'check_jsnorm.c' || echo '$(srcdir)/'`check_jsnorm.c check_clamav-check_jsnorm.obj: check_jsnorm.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_clamav_CFLAGS) $(CFLAGS) -MT check_clamav-check_jsnorm.obj -MD -MP -MF $(DEPDIR)/check_clamav-check_jsnorm.Tpo -c -o check_clamav-check_jsnorm.obj `if test -f 'check_jsnorm.c'; then $(CYGPATH_W) 'check_jsnorm.c'; else $(CYGPATH_W) '$(srcdir)/check_jsnorm.c'; fi` +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamav_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT check_clamav-check_jsnorm.obj -MD -MP -MF $(DEPDIR)/check_clamav-check_jsnorm.Tpo -c -o check_clamav-check_jsnorm.obj `if test -f 'check_jsnorm.c'; then $(CYGPATH_W) 'check_jsnorm.c'; else $(CYGPATH_W) '$(srcdir)/check_jsnorm.c'; fi` @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_clamav-check_jsnorm.Tpo $(DEPDIR)/check_clamav-check_jsnorm.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check_jsnorm.c' object='check_clamav-check_jsnorm.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_clamav_CFLAGS) $(CFLAGS) -c -o check_clamav-check_jsnorm.obj `if test -f 'check_jsnorm.c'; then $(CYGPATH_W) 'check_jsnorm.c'; else $(CYGPATH_W) '$(srcdir)/check_jsnorm.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamav_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o check_clamav-check_jsnorm.obj `if test -f 'check_jsnorm.c'; then $(CYGPATH_W) 'check_jsnorm.c'; else $(CYGPATH_W) '$(srcdir)/check_jsnorm.c'; fi` check_clamav-check_str.o: check_str.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_clamav_CFLAGS) $(CFLAGS) -MT check_clamav-check_str.o -MD -MP -MF $(DEPDIR)/check_clamav-check_str.Tpo -c -o check_clamav-check_str.o `test -f 'check_str.c' || echo '$(srcdir)/'`check_str.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamav_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT check_clamav-check_str.o -MD -MP -MF $(DEPDIR)/check_clamav-check_str.Tpo -c -o check_clamav-check_str.o `test -f 'check_str.c' || echo '$(srcdir)/'`check_str.c @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_clamav-check_str.Tpo $(DEPDIR)/check_clamav-check_str.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check_str.c' object='check_clamav-check_str.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_clamav_CFLAGS) $(CFLAGS) -c -o check_clamav-check_str.o `test -f 'check_str.c' || echo '$(srcdir)/'`check_str.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamav_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o check_clamav-check_str.o `test -f 'check_str.c' || echo '$(srcdir)/'`check_str.c check_clamav-check_str.obj: check_str.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_clamav_CFLAGS) $(CFLAGS) -MT check_clamav-check_str.obj -MD -MP -MF $(DEPDIR)/check_clamav-check_str.Tpo -c -o check_clamav-check_str.obj `if test -f 'check_str.c'; then $(CYGPATH_W) 'check_str.c'; else $(CYGPATH_W) '$(srcdir)/check_str.c'; fi` +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamav_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT check_clamav-check_str.obj -MD -MP -MF $(DEPDIR)/check_clamav-check_str.Tpo -c -o check_clamav-check_str.obj `if test -f 'check_str.c'; then $(CYGPATH_W) 'check_str.c'; else $(CYGPATH_W) '$(srcdir)/check_str.c'; fi` @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_clamav-check_str.Tpo $(DEPDIR)/check_clamav-check_str.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check_str.c' object='check_clamav-check_str.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_clamav_CFLAGS) $(CFLAGS) -c -o check_clamav-check_str.obj `if test -f 'check_str.c'; then $(CYGPATH_W) 'check_str.c'; else $(CYGPATH_W) '$(srcdir)/check_str.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamav_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o check_clamav-check_str.obj `if test -f 'check_str.c'; then $(CYGPATH_W) 'check_str.c'; else $(CYGPATH_W) '$(srcdir)/check_str.c'; fi` check_clamav-check_regex.o: check_regex.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_clamav_CFLAGS) $(CFLAGS) -MT check_clamav-check_regex.o -MD -MP -MF $(DEPDIR)/check_clamav-check_regex.Tpo -c -o check_clamav-check_regex.o `test -f 'check_regex.c' || echo '$(srcdir)/'`check_regex.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamav_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT check_clamav-check_regex.o -MD -MP -MF $(DEPDIR)/check_clamav-check_regex.Tpo -c -o check_clamav-check_regex.o `test -f 'check_regex.c' || echo '$(srcdir)/'`check_regex.c @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_clamav-check_regex.Tpo $(DEPDIR)/check_clamav-check_regex.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check_regex.c' object='check_clamav-check_regex.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_clamav_CFLAGS) $(CFLAGS) -c -o check_clamav-check_regex.o `test -f 'check_regex.c' || echo '$(srcdir)/'`check_regex.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamav_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o check_clamav-check_regex.o `test -f 'check_regex.c' || echo '$(srcdir)/'`check_regex.c check_clamav-check_regex.obj: check_regex.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_clamav_CFLAGS) $(CFLAGS) -MT check_clamav-check_regex.obj -MD -MP -MF $(DEPDIR)/check_clamav-check_regex.Tpo -c -o check_clamav-check_regex.obj `if test -f 'check_regex.c'; then $(CYGPATH_W) 'check_regex.c'; else $(CYGPATH_W) '$(srcdir)/check_regex.c'; fi` +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamav_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT check_clamav-check_regex.obj -MD -MP -MF $(DEPDIR)/check_clamav-check_regex.Tpo -c -o check_clamav-check_regex.obj `if test -f 'check_regex.c'; then $(CYGPATH_W) 'check_regex.c'; else $(CYGPATH_W) '$(srcdir)/check_regex.c'; fi` @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_clamav-check_regex.Tpo $(DEPDIR)/check_clamav-check_regex.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check_regex.c' object='check_clamav-check_regex.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_clamav_CFLAGS) $(CFLAGS) -c -o check_clamav-check_regex.obj `if test -f 'check_regex.c'; then $(CYGPATH_W) 'check_regex.c'; else $(CYGPATH_W) '$(srcdir)/check_regex.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamav_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o check_clamav-check_regex.obj `if test -f 'check_regex.c'; then $(CYGPATH_W) 'check_regex.c'; else $(CYGPATH_W) '$(srcdir)/check_regex.c'; fi` check_clamav-check_disasm.o: check_disasm.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_clamav_CFLAGS) $(CFLAGS) -MT check_clamav-check_disasm.o -MD -MP -MF $(DEPDIR)/check_clamav-check_disasm.Tpo -c -o check_clamav-check_disasm.o `test -f 'check_disasm.c' || echo '$(srcdir)/'`check_disasm.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamav_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT check_clamav-check_disasm.o -MD -MP -MF $(DEPDIR)/check_clamav-check_disasm.Tpo -c -o check_clamav-check_disasm.o `test -f 'check_disasm.c' || echo '$(srcdir)/'`check_disasm.c @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_clamav-check_disasm.Tpo $(DEPDIR)/check_clamav-check_disasm.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check_disasm.c' object='check_clamav-check_disasm.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_clamav_CFLAGS) $(CFLAGS) -c -o check_clamav-check_disasm.o `test -f 'check_disasm.c' || echo '$(srcdir)/'`check_disasm.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamav_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o check_clamav-check_disasm.o `test -f 'check_disasm.c' || echo '$(srcdir)/'`check_disasm.c check_clamav-check_disasm.obj: check_disasm.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_clamav_CFLAGS) $(CFLAGS) -MT check_clamav-check_disasm.obj -MD -MP -MF $(DEPDIR)/check_clamav-check_disasm.Tpo -c -o check_clamav-check_disasm.obj `if test -f 'check_disasm.c'; then $(CYGPATH_W) 'check_disasm.c'; else $(CYGPATH_W) '$(srcdir)/check_disasm.c'; fi` +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamav_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT check_clamav-check_disasm.obj -MD -MP -MF $(DEPDIR)/check_clamav-check_disasm.Tpo -c -o check_clamav-check_disasm.obj `if test -f 'check_disasm.c'; then $(CYGPATH_W) 'check_disasm.c'; else $(CYGPATH_W) '$(srcdir)/check_disasm.c'; fi` @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_clamav-check_disasm.Tpo $(DEPDIR)/check_clamav-check_disasm.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check_disasm.c' object='check_clamav-check_disasm.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_clamav_CFLAGS) $(CFLAGS) -c -o check_clamav-check_disasm.obj `if test -f 'check_disasm.c'; then $(CYGPATH_W) 'check_disasm.c'; else $(CYGPATH_W) '$(srcdir)/check_disasm.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamav_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o check_clamav-check_disasm.obj `if test -f 'check_disasm.c'; then $(CYGPATH_W) 'check_disasm.c'; else $(CYGPATH_W) '$(srcdir)/check_disasm.c'; fi` check_clamav-check_uniq.o: check_uniq.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_clamav_CFLAGS) $(CFLAGS) -MT check_clamav-check_uniq.o -MD -MP -MF $(DEPDIR)/check_clamav-check_uniq.Tpo -c -o check_clamav-check_uniq.o `test -f 'check_uniq.c' || echo '$(srcdir)/'`check_uniq.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamav_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT check_clamav-check_uniq.o -MD -MP -MF $(DEPDIR)/check_clamav-check_uniq.Tpo -c -o check_clamav-check_uniq.o `test -f 'check_uniq.c' || echo '$(srcdir)/'`check_uniq.c @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_clamav-check_uniq.Tpo $(DEPDIR)/check_clamav-check_uniq.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check_uniq.c' object='check_clamav-check_uniq.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_clamav_CFLAGS) $(CFLAGS) -c -o check_clamav-check_uniq.o `test -f 'check_uniq.c' || echo '$(srcdir)/'`check_uniq.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamav_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o check_clamav-check_uniq.o `test -f 'check_uniq.c' || echo '$(srcdir)/'`check_uniq.c check_clamav-check_uniq.obj: check_uniq.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_clamav_CFLAGS) $(CFLAGS) -MT check_clamav-check_uniq.obj -MD -MP -MF $(DEPDIR)/check_clamav-check_uniq.Tpo -c -o check_clamav-check_uniq.obj `if test -f 'check_uniq.c'; then $(CYGPATH_W) 'check_uniq.c'; else $(CYGPATH_W) '$(srcdir)/check_uniq.c'; fi` +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamav_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT check_clamav-check_uniq.obj -MD -MP -MF $(DEPDIR)/check_clamav-check_uniq.Tpo -c -o check_clamav-check_uniq.obj `if test -f 'check_uniq.c'; then $(CYGPATH_W) 'check_uniq.c'; else $(CYGPATH_W) '$(srcdir)/check_uniq.c'; fi` @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_clamav-check_uniq.Tpo $(DEPDIR)/check_clamav-check_uniq.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check_uniq.c' object='check_clamav-check_uniq.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_clamav_CFLAGS) $(CFLAGS) -c -o check_clamav-check_uniq.obj `if test -f 'check_uniq.c'; then $(CYGPATH_W) 'check_uniq.c'; else $(CYGPATH_W) '$(srcdir)/check_uniq.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamav_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o check_clamav-check_uniq.obj `if test -f 'check_uniq.c'; then $(CYGPATH_W) 'check_uniq.c'; else $(CYGPATH_W) '$(srcdir)/check_uniq.c'; fi` check_clamav-check_matchers.o: check_matchers.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_clamav_CFLAGS) $(CFLAGS) -MT check_clamav-check_matchers.o -MD -MP -MF $(DEPDIR)/check_clamav-check_matchers.Tpo -c -o check_clamav-check_matchers.o `test -f 'check_matchers.c' || echo '$(srcdir)/'`check_matchers.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamav_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT check_clamav-check_matchers.o -MD -MP -MF $(DEPDIR)/check_clamav-check_matchers.Tpo -c -o check_clamav-check_matchers.o `test -f 'check_matchers.c' || echo '$(srcdir)/'`check_matchers.c @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_clamav-check_matchers.Tpo $(DEPDIR)/check_clamav-check_matchers.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check_matchers.c' object='check_clamav-check_matchers.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_clamav_CFLAGS) $(CFLAGS) -c -o check_clamav-check_matchers.o `test -f 'check_matchers.c' || echo '$(srcdir)/'`check_matchers.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamav_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o check_clamav-check_matchers.o `test -f 'check_matchers.c' || echo '$(srcdir)/'`check_matchers.c check_clamav-check_matchers.obj: check_matchers.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_clamav_CFLAGS) $(CFLAGS) -MT check_clamav-check_matchers.obj -MD -MP -MF $(DEPDIR)/check_clamav-check_matchers.Tpo -c -o check_clamav-check_matchers.obj `if test -f 'check_matchers.c'; then $(CYGPATH_W) 'check_matchers.c'; else $(CYGPATH_W) '$(srcdir)/check_matchers.c'; fi` +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamav_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT check_clamav-check_matchers.obj -MD -MP -MF $(DEPDIR)/check_clamav-check_matchers.Tpo -c -o check_clamav-check_matchers.obj `if test -f 'check_matchers.c'; then $(CYGPATH_W) 'check_matchers.c'; else $(CYGPATH_W) '$(srcdir)/check_matchers.c'; fi` @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_clamav-check_matchers.Tpo $(DEPDIR)/check_clamav-check_matchers.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check_matchers.c' object='check_clamav-check_matchers.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_clamav_CFLAGS) $(CFLAGS) -c -o check_clamav-check_matchers.obj `if test -f 'check_matchers.c'; then $(CYGPATH_W) 'check_matchers.c'; else $(CYGPATH_W) '$(srcdir)/check_matchers.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamav_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o check_clamav-check_matchers.obj `if test -f 'check_matchers.c'; then $(CYGPATH_W) 'check_matchers.c'; else $(CYGPATH_W) '$(srcdir)/check_matchers.c'; fi` mostlyclean-libtool: -rm -f *.lo @@ -660,11 +590,8 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) $(check_SCRIPTS) $(MAKE) $(AM_MAKEFLAGS) check-TESTS check: check-am -all-am: Makefile $(PROGRAMS) $(SCRIPTS) +all-am: Makefile installdirs: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done install: install-am install-exec: install-exec-am install-data: install-data-am @@ -693,8 +620,8 @@ maintainer-clean-generic: @ENABLE_COVERAGE_FALSE@clean-local: clean: clean-am -clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \ - clean-libtool clean-local mostlyclean-am +clean-am: clean-checkPROGRAMS clean-generic clean-libtool clean-local \ + mostlyclean-am distclean: distclean-am -rm -rf ./$(DEPDIR) @@ -716,7 +643,7 @@ install-data-am: install-dvi: install-dvi-am -install-exec-am: install-binPROGRAMS install-dist_binSCRIPTS +install-exec-am: install-html: install-html-am @@ -728,7 +655,7 @@ install-pdf: install-pdf-am install-ps: install-ps-am -installcheck-am: installcheck-binPROGRAMS installcheck-dist_binSCRIPTS +installcheck-am: maintainer-clean: maintainer-clean-am -rm -rf ./$(DEPDIR) @@ -748,26 +675,23 @@ ps: ps-am ps-am: -uninstall-am: uninstall-binPROGRAMS uninstall-dist_binSCRIPTS +uninstall-am: .MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ - clean-binPROGRAMS clean-checkPROGRAMS clean-generic \ - clean-libtool clean-local ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am \ - install-dist_binSCRIPTS install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installcheck-binPROGRAMS \ - installcheck-dist_binSCRIPTS installdirs maintainer-clean \ + clean-checkPROGRAMS clean-generic clean-libtool clean-local \ + ctags distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-binPROGRAMS \ - uninstall-dist_binSCRIPTS + tags uninstall uninstall-am check_clamd.sh: $(FILES) diff --git a/unit_tests/check_clamav.c b/unit_tests/check_clamav.c index 9b4f36831..4b59a09a2 100644 --- a/unit_tests/check_clamav.c +++ b/unit_tests/check_clamav.c @@ -4,15 +4,6 @@ #include -#ifndef HAVE_CHECK -int main(int argc, char **argv) -{ - puts("\n*** Unit tests disabled in this build\n*** Use ./configure --enable-check to enable them\n"); - /* tell automake the test was skipped */ - return 77; -} -#else - #include #include #include @@ -368,5 +359,3 @@ int main(int argc, char **argv) srunner_free(sr); return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE; } - -#endif /* HAVE_CHECK */ diff --git a/unit_tests/check_clamav_skip.c b/unit_tests/check_clamav_skip.c new file mode 100644 index 000000000..73877f842 --- /dev/null +++ b/unit_tests/check_clamav_skip.c @@ -0,0 +1,7 @@ +#include +int main(int argc, char **argv) +{ + puts("\n*** Unit tests disabled in this build\n*** Use ./configure --enable-check to enable them\n"); + /* tell automake the test was skipped */ + return 77; +} diff --git a/unit_tests/check_disasm.c b/unit_tests/check_disasm.c index b3ccd2d76..8fb2ace6f 100644 --- a/unit_tests/check_disasm.c +++ b/unit_tests/check_disasm.c @@ -24,7 +24,6 @@ #endif #include -#ifdef HAVE_CHECK #include #include @@ -152,5 +151,3 @@ Suite *test_disasm_suite(void) return s; } - -#endif diff --git a/unit_tests/check_jsnorm.c b/unit_tests/check_jsnorm.c index 82bc37438..da5686c3a 100644 --- a/unit_tests/check_jsnorm.c +++ b/unit_tests/check_jsnorm.c @@ -24,7 +24,6 @@ #endif #include -#ifdef HAVE_CHECK #include #include @@ -508,4 +507,3 @@ Suite *test_jsnorm_suite(void) return s; } -#endif diff --git a/unit_tests/check_matchers.c b/unit_tests/check_matchers.c index af3c9f725..0b26ee0eb 100644 --- a/unit_tests/check_matchers.c +++ b/unit_tests/check_matchers.c @@ -21,8 +21,6 @@ #include "clamav-config.h" #endif -#ifdef HAVE_CHECK - #include #include #include @@ -127,4 +125,3 @@ Suite *test_matchers_suite(void) return s; } -#endif diff --git a/unit_tests/check_regex.c b/unit_tests/check_regex.c index a7c60e28e..adcf337fa 100644 --- a/unit_tests/check_regex.c +++ b/unit_tests/check_regex.c @@ -24,7 +24,6 @@ #endif #include -#ifdef HAVE_CHECK #include #include #include @@ -472,4 +471,3 @@ Suite *test_regex_suite(void) return s; } -#endif diff --git a/unit_tests/check_str.c b/unit_tests/check_str.c index 9bf35b3a7..c015d4244 100644 --- a/unit_tests/check_str.c +++ b/unit_tests/check_str.c @@ -24,7 +24,6 @@ #endif #include -#ifdef HAVE_CHECK #include #include @@ -188,4 +187,4 @@ Suite *test_str_suite(void) return s; } -#endif + diff --git a/unit_tests/check_uniq.c b/unit_tests/check_uniq.c index 60448296c..c71caf92b 100644 --- a/unit_tests/check_uniq.c +++ b/unit_tests/check_uniq.c @@ -23,8 +23,6 @@ #include "clamav-config.h" #endif -#ifdef HAVE_CHECK - #include #include #include @@ -107,5 +105,3 @@ Suite *test_uniq_suite(void) return s; } - -#endif