git-svn: trunk@4172
Török Edvin authored on 2008/09/11 20:02:12... | ... |
@@ -1,3 +1,11 @@ |
1 |
+Thu Sep 11 13:16:22 EEST 2008 (edwin) |
|
2 |
+------------------------------------- |
|
3 |
+ * build system: allow 'make check' to work even if check is not installed |
|
4 |
+ by skipping checks that require it. (bb #1157) |
|
5 |
+ if configure is not able to find check, you can use |
|
6 |
+ --with-libcheck-prefix, instead of CHECK_CFLAGS and |
|
7 |
+ CHECK_LIBS. |
|
8 |
+ |
|
1 | 9 |
Wed Sep 10 20:05:27 CEST 2008 (tk) |
2 | 10 |
---------------------------------- |
3 | 11 |
* configure: use getaddrinfo() whenever available (can be disabled |
... | ... |
@@ -134,7 +134,7 @@ CC = @CC@ |
134 | 134 |
CCDEPMODE = @CCDEPMODE@ |
135 | 135 |
CFGDIR = @CFGDIR@ |
136 | 136 |
CFLAGS = @CFLAGS@ |
137 |
-CHECK_CFLAGS = @CHECK_CFLAGS@ |
|
137 |
+CHECK_CPPFLAGS = @CHECK_CPPFLAGS@ |
|
138 | 138 |
CHECK_LIBS = @CHECK_LIBS@ |
139 | 139 |
CLAMAVGROUP = @CLAMAVGROUP@ |
140 | 140 |
CLAMAVUSER = @CLAMAVUSER@ |
... | ... |
@@ -199,7 +199,6 @@ PACKAGE_STRING = @PACKAGE_STRING@ |
199 | 199 |
PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
200 | 200 |
PACKAGE_VERSION = @PACKAGE_VERSION@ |
201 | 201 |
PATH_SEPARATOR = @PATH_SEPARATOR@ |
202 |
-PKG_CONFIG = @PKG_CONFIG@ |
|
203 | 202 |
RANLIB = @RANLIB@ |
204 | 203 |
SED = @SED@ |
205 | 204 |
SET_MAKE = @SET_MAKE@ |
... | ... |
@@ -6782,164 +6782,6 @@ AC_SUBST([SED]) |
6782 | 6782 |
AC_MSG_RESULT([$SED]) |
6783 | 6783 |
]) |
6784 | 6784 |
|
6785 |
-# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- |
|
6786 |
-# |
|
6787 |
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>. |
|
6788 |
-# |
|
6789 |
-# This program is free software; you can redistribute it and/or modify |
|
6790 |
-# it under the terms of the GNU General Public License as published by |
|
6791 |
-# the Free Software Foundation; either version 2 of the License, or |
|
6792 |
-# (at your option) any later version. |
|
6793 |
-# |
|
6794 |
-# This program is distributed in the hope that it will be useful, but |
|
6795 |
-# WITHOUT ANY WARRANTY; without even the implied warranty of |
|
6796 |
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
|
6797 |
-# General Public License for more details. |
|
6798 |
-# |
|
6799 |
-# You should have received a copy of the GNU General Public License |
|
6800 |
-# along with this program; if not, write to the Free Software |
|
6801 |
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
|
6802 |
-# |
|
6803 |
-# As a special exception to the GNU General Public License, if you |
|
6804 |
-# distribute this file as part of a program that contains a |
|
6805 |
-# configuration script generated by Autoconf, you may include it under |
|
6806 |
-# the same distribution terms that you use for the rest of that program. |
|
6807 |
- |
|
6808 |
-# PKG_PROG_PKG_CONFIG([MIN-VERSION]) |
|
6809 |
-# ---------------------------------- |
|
6810 |
-AC_DEFUN([PKG_PROG_PKG_CONFIG], |
|
6811 |
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) |
|
6812 |
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) |
|
6813 |
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl |
|
6814 |
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then |
|
6815 |
- AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) |
|
6816 |
-fi |
|
6817 |
-if test -n "$PKG_CONFIG"; then |
|
6818 |
- _pkg_min_version=m4_default([$1], [0.9.0]) |
|
6819 |
- AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) |
|
6820 |
- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then |
|
6821 |
- AC_MSG_RESULT([yes]) |
|
6822 |
- else |
|
6823 |
- AC_MSG_RESULT([no]) |
|
6824 |
- PKG_CONFIG="" |
|
6825 |
- fi |
|
6826 |
- |
|
6827 |
-fi[]dnl |
|
6828 |
-])# PKG_PROG_PKG_CONFIG |
|
6829 |
- |
|
6830 |
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) |
|
6831 |
-# |
|
6832 |
-# Check to see whether a particular set of modules exists. Similar |
|
6833 |
-# to PKG_CHECK_MODULES(), but does not set variables or print errors. |
|
6834 |
-# |
|
6835 |
-# |
|
6836 |
-# Similar to PKG_CHECK_MODULES, make sure that the first instance of |
|
6837 |
-# this or PKG_CHECK_MODULES is called, or make sure to call |
|
6838 |
-# PKG_CHECK_EXISTS manually |
|
6839 |
-# -------------------------------------------------------------- |
|
6840 |
-AC_DEFUN([PKG_CHECK_EXISTS], |
|
6841 |
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl |
|
6842 |
-if test -n "$PKG_CONFIG" && \ |
|
6843 |
- AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then |
|
6844 |
- m4_ifval([$2], [$2], [:]) |
|
6845 |
-m4_ifvaln([$3], [else |
|
6846 |
- $3])dnl |
|
6847 |
-fi]) |
|
6848 |
- |
|
6849 |
- |
|
6850 |
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) |
|
6851 |
-# --------------------------------------------- |
|
6852 |
-m4_define([_PKG_CONFIG], |
|
6853 |
-[if test -n "$PKG_CONFIG"; then |
|
6854 |
- if test -n "$$1"; then |
|
6855 |
- pkg_cv_[]$1="$$1" |
|
6856 |
- else |
|
6857 |
- PKG_CHECK_EXISTS([$3], |
|
6858 |
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], |
|
6859 |
- [pkg_failed=yes]) |
|
6860 |
- fi |
|
6861 |
-else |
|
6862 |
- pkg_failed=untried |
|
6863 |
-fi[]dnl |
|
6864 |
-])# _PKG_CONFIG |
|
6865 |
- |
|
6866 |
-# _PKG_SHORT_ERRORS_SUPPORTED |
|
6867 |
-# ----------------------------- |
|
6868 |
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], |
|
6869 |
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) |
|
6870 |
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
|
6871 |
- _pkg_short_errors_supported=yes |
|
6872 |
-else |
|
6873 |
- _pkg_short_errors_supported=no |
|
6874 |
-fi[]dnl |
|
6875 |
-])# _PKG_SHORT_ERRORS_SUPPORTED |
|
6876 |
- |
|
6877 |
- |
|
6878 |
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], |
|
6879 |
-# [ACTION-IF-NOT-FOUND]) |
|
6880 |
-# |
|
6881 |
-# |
|
6882 |
-# Note that if there is a possibility the first call to |
|
6883 |
-# PKG_CHECK_MODULES might not happen, you should be sure to include an |
|
6884 |
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac |
|
6885 |
-# |
|
6886 |
-# |
|
6887 |
-# -------------------------------------------------------------- |
|
6888 |
-AC_DEFUN([PKG_CHECK_MODULES], |
|
6889 |
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl |
|
6890 |
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl |
|
6891 |
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl |
|
6892 |
- |
|
6893 |
-pkg_failed=no |
|
6894 |
-AC_MSG_CHECKING([for $1]) |
|
6895 |
- |
|
6896 |
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) |
|
6897 |
-_PKG_CONFIG([$1][_LIBS], [libs], [$2]) |
|
6898 |
- |
|
6899 |
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS |
|
6900 |
-and $1[]_LIBS to avoid the need to call pkg-config. |
|
6901 |
-See the pkg-config man page for more details.]) |
|
6902 |
- |
|
6903 |
-if test $pkg_failed = yes; then |
|
6904 |
- _PKG_SHORT_ERRORS_SUPPORTED |
|
6905 |
- if test $_pkg_short_errors_supported = yes; then |
|
6906 |
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` |
|
6907 |
- else |
|
6908 |
- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` |
|
6909 |
- fi |
|
6910 |
- # Put the nasty error message in config.log where it belongs |
|
6911 |
- echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD |
|
6912 |
- |
|
6913 |
- ifelse([$4], , [AC_MSG_ERROR(dnl |
|
6914 |
-[Package requirements ($2) were not met: |
|
6915 |
- |
|
6916 |
-$$1_PKG_ERRORS |
|
6917 |
- |
|
6918 |
-Consider adjusting the PKG_CONFIG_PATH environment variable if you |
|
6919 |
-installed software in a non-standard prefix. |
|
6920 |
- |
|
6921 |
-_PKG_TEXT |
|
6922 |
-])], |
|
6923 |
- [AC_MSG_RESULT([no]) |
|
6924 |
- $4]) |
|
6925 |
-elif test $pkg_failed = untried; then |
|
6926 |
- ifelse([$4], , [AC_MSG_FAILURE(dnl |
|
6927 |
-[The pkg-config script could not be found or is too old. Make sure it |
|
6928 |
-is in your PATH or set the PKG_CONFIG environment variable to the full |
|
6929 |
-path to pkg-config. |
|
6930 |
- |
|
6931 |
-_PKG_TEXT |
|
6932 |
- |
|
6933 |
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])], |
|
6934 |
- [$4]) |
|
6935 |
-else |
|
6936 |
- $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS |
|
6937 |
- $1[]_LIBS=$pkg_cv_[]$1[]_LIBS |
|
6938 |
- AC_MSG_RESULT([yes]) |
|
6939 |
- ifelse([$3], , :, [$3]) |
|
6940 |
-fi[]dnl |
|
6941 |
-])# PKG_CHECK_MODULES |
|
6942 |
- |
|
6943 | 6785 |
# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. |
6944 | 6786 |
# |
6945 | 6787 |
# This file is free software; the Free Software Foundation |
... | ... |
@@ -105,9 +105,6 @@ |
105 | 105 |
/* have bzip2 */ |
106 | 106 |
#undef HAVE_BZLIB_H |
107 | 107 |
|
108 |
-/* Enable 'check' unit tests */ |
|
109 |
-#undef HAVE_CHECK |
|
110 |
- |
|
111 | 108 |
/* ancillary data style fd pass */ |
112 | 109 |
#undef HAVE_CONTROL_IN_MSGHDR |
113 | 110 |
|
... | ... |
@@ -162,6 +159,9 @@ |
162 | 162 |
/* in_port_t is defined */ |
163 | 163 |
#undef HAVE_IN_PORT_T |
164 | 164 |
|
165 |
+/* Define to '1' if you have the check.h library */ |
|
166 |
+#undef HAVE_LIBCHECK |
|
167 |
+ |
|
165 | 168 |
/* Define if you have the gmp library. */ |
166 | 169 |
#undef HAVE_LIBGMP |
167 | 170 |
|
... | ... |
@@ -117,7 +117,7 @@ CC = @CC@ |
117 | 117 |
CCDEPMODE = @CCDEPMODE@ |
118 | 118 |
CFGDIR = @CFGDIR@ |
119 | 119 |
CFLAGS = `echo "@CFLAGS@" | sed -e 's/-Werror[^-]//'` |
120 |
-CHECK_CFLAGS = @CHECK_CFLAGS@ |
|
120 |
+CHECK_CPPFLAGS = @CHECK_CPPFLAGS@ |
|
121 | 121 |
CHECK_LIBS = @CHECK_LIBS@ |
122 | 122 |
CLAMAVGROUP = @CLAMAVGROUP@ |
123 | 123 |
CLAMAVUSER = @CLAMAVUSER@ |
... | ... |
@@ -182,7 +182,6 @@ PACKAGE_STRING = @PACKAGE_STRING@ |
182 | 182 |
PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
183 | 183 |
PACKAGE_VERSION = @PACKAGE_VERSION@ |
184 | 184 |
PATH_SEPARATOR = @PATH_SEPARATOR@ |
185 |
-PKG_CONFIG = @PKG_CONFIG@ |
|
186 | 185 |
RANLIB = @RANLIB@ |
187 | 186 |
SED = @SED@ |
188 | 187 |
SET_MAKE = @SET_MAKE@ |
... | ... |
@@ -102,7 +102,7 @@ CC = @CC@ |
102 | 102 |
CCDEPMODE = @CCDEPMODE@ |
103 | 103 |
CFGDIR = @CFGDIR@ |
104 | 104 |
CFLAGS = @CFLAGS@ |
105 |
-CHECK_CFLAGS = @CHECK_CFLAGS@ |
|
105 |
+CHECK_CPPFLAGS = @CHECK_CPPFLAGS@ |
|
106 | 106 |
CHECK_LIBS = @CHECK_LIBS@ |
107 | 107 |
CLAMAVGROUP = @CLAMAVGROUP@ |
108 | 108 |
CLAMAVUSER = @CLAMAVUSER@ |
... | ... |
@@ -167,7 +167,6 @@ PACKAGE_STRING = @PACKAGE_STRING@ |
167 | 167 |
PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
168 | 168 |
PACKAGE_VERSION = @PACKAGE_VERSION@ |
169 | 169 |
PATH_SEPARATOR = @PATH_SEPARATOR@ |
170 |
-PKG_CONFIG = @PKG_CONFIG@ |
|
171 | 170 |
RANLIB = @RANLIB@ |
172 | 171 |
SED = @SED@ |
173 | 172 |
SET_MAKE = @SET_MAKE@ |
... | ... |
@@ -122,7 +122,7 @@ CC = @CC@ |
122 | 122 |
CCDEPMODE = @CCDEPMODE@ |
123 | 123 |
CFGDIR = @CFGDIR@ |
124 | 124 |
CFLAGS = @CFLAGS@ |
125 |
-CHECK_CFLAGS = @CHECK_CFLAGS@ |
|
125 |
+CHECK_CPPFLAGS = @CHECK_CPPFLAGS@ |
|
126 | 126 |
CHECK_LIBS = @CHECK_LIBS@ |
127 | 127 |
CLAMAVGROUP = @CLAMAVGROUP@ |
128 | 128 |
CLAMAVUSER = @CLAMAVUSER@ |
... | ... |
@@ -187,7 +187,6 @@ PACKAGE_STRING = @PACKAGE_STRING@ |
187 | 187 |
PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
188 | 188 |
PACKAGE_VERSION = @PACKAGE_VERSION@ |
189 | 189 |
PATH_SEPARATOR = @PATH_SEPARATOR@ |
190 |
-PKG_CONFIG = @PKG_CONFIG@ |
|
191 | 190 |
RANLIB = @RANLIB@ |
192 | 191 |
SED = @SED@ |
193 | 192 |
SET_MAKE = @SET_MAKE@ |
... | ... |
@@ -113,7 +113,7 @@ CC = @CC@ |
113 | 113 |
CCDEPMODE = @CCDEPMODE@ |
114 | 114 |
CFGDIR = @CFGDIR@ |
115 | 115 |
CFLAGS = @CFLAGS@ |
116 |
-CHECK_CFLAGS = @CHECK_CFLAGS@ |
|
116 |
+CHECK_CPPFLAGS = @CHECK_CPPFLAGS@ |
|
117 | 117 |
CHECK_LIBS = @CHECK_LIBS@ |
118 | 118 |
CLAMAVGROUP = @CLAMAVGROUP@ |
119 | 119 |
CLAMAVUSER = @CLAMAVUSER@ |
... | ... |
@@ -178,7 +178,6 @@ PACKAGE_STRING = @PACKAGE_STRING@ |
178 | 178 |
PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
179 | 179 |
PACKAGE_VERSION = @PACKAGE_VERSION@ |
180 | 180 |
PATH_SEPARATOR = @PATH_SEPARATOR@ |
181 |
-PKG_CONFIG = @PKG_CONFIG@ |
|
182 | 181 |
RANLIB = @RANLIB@ |
183 | 182 |
SED = @SED@ |
184 | 183 |
SET_MAKE = @SET_MAKE@ |
... | ... |
@@ -104,7 +104,7 @@ CC = @CC@ |
104 | 104 |
CCDEPMODE = @CCDEPMODE@ |
105 | 105 |
CFGDIR = @CFGDIR@ |
106 | 106 |
CFLAGS = @CFLAGS@ |
107 |
-CHECK_CFLAGS = @CHECK_CFLAGS@ |
|
107 |
+CHECK_CPPFLAGS = @CHECK_CPPFLAGS@ |
|
108 | 108 |
CHECK_LIBS = @CHECK_LIBS@ |
109 | 109 |
CLAMAVGROUP = @CLAMAVGROUP@ |
110 | 110 |
CLAMAVUSER = @CLAMAVUSER@ |
... | ... |
@@ -169,7 +169,6 @@ PACKAGE_STRING = @PACKAGE_STRING@ |
169 | 169 |
PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
170 | 170 |
PACKAGE_VERSION = @PACKAGE_VERSION@ |
171 | 171 |
PATH_SEPARATOR = @PATH_SEPARATOR@ |
172 |
-PKG_CONFIG = @PKG_CONFIG@ |
|
173 | 172 |
RANLIB = @RANLIB@ |
174 | 173 |
SED = @SED@ |
175 | 174 |
SET_MAKE = @SET_MAKE@ |
... | ... |
@@ -876,16 +876,15 @@ VERSIONSCRIPTFLAG |
876 | 876 |
VERSIONSCRIPT_TRUE |
877 | 877 |
VERSIONSCRIPT_FALSE |
878 | 878 |
GPERF |
879 |
-PKG_CONFIG |
|
880 |
-CHECK_CFLAGS |
|
879 |
+CHECK_CPPFLAGS |
|
881 | 880 |
CHECK_LIBS |
881 |
+HAVE_LIBCHECK_TRUE |
|
882 |
+HAVE_LIBCHECK_FALSE |
|
882 | 883 |
GCOV |
883 | 884 |
LCOV |
884 | 885 |
GENHTML |
885 | 886 |
ENABLE_COVERAGE_TRUE |
886 | 887 |
ENABLE_COVERAGE_FALSE |
887 |
-ENABLE_UT_INSTALL_TRUE |
|
888 |
-ENABLE_UT_INSTALL_FALSE |
|
889 | 888 |
MAINTAINER_MODE_TRUE |
890 | 889 |
MAINTAINER_MODE_FALSE |
891 | 890 |
MAINT |
... | ... |
@@ -925,10 +924,7 @@ CFLAGS |
925 | 925 |
LDFLAGS |
926 | 926 |
LIBS |
927 | 927 |
CPPFLAGS |
928 |
-CPP |
|
929 |
-PKG_CONFIG |
|
930 |
-CHECK_CFLAGS |
|
931 |
-CHECK_LIBS' |
|
928 |
+CPP' |
|
932 | 929 |
|
933 | 930 |
|
934 | 931 |
# Initialize some variables set by options. |
... | ... |
@@ -1519,13 +1515,12 @@ Optional Features: |
1519 | 1519 |
--disable-gcc-vcheck do not check for buggy gcc version |
1520 | 1520 |
--enable-experimental enable experimental code |
1521 | 1521 |
--enable-check Enable 'check' unit tests (default=auto) |
1522 |
- --enable-tests-install install unit tests [default=no] |
|
1522 |
+ --disable-rpath do not hardcode runtime library paths |
|
1523 | 1523 |
--enable-coverage turn on test coverage [default=no] |
1524 | 1524 |
--enable-maintainer-mode enable make rules and dependencies not useful |
1525 | 1525 |
(and sometimes confusing) to the casual installer |
1526 | 1526 |
--disable-zlib-vcheck do not check for buggy zlib version |
1527 | 1527 |
--disable-bzip2 disable bzip2 support |
1528 |
- --disable-rpath do not hardcode runtime library paths |
|
1529 | 1528 |
--disable-unrar don't build libclamunrar and libclamunrar_iface |
1530 | 1529 |
--disable-getaddrinfo disable support for getaddrinfo |
1531 | 1530 |
--disable-ipv6 disable IPv6 support |
... | ... |
@@ -1554,9 +1549,11 @@ Optional Packages: |
1554 | 1554 |
both] |
1555 | 1555 |
--with-gnu-ld assume the C compiler uses GNU ld [default=no] |
1556 | 1556 |
--with-fpu-words-bigendian=(yes/no/auto) specify FPU endianess (default=auto) |
1557 |
+ --with-gnu-ld assume the C compiler uses GNU ld default=no |
|
1558 |
+ --with-libcheck-prefix[=DIR] search for libcheck in DIR/include and DIR/lib |
|
1559 |
+ --without-libcheck-prefix don't search for libcheck in includedir and libdir |
|
1557 | 1560 |
--with-zlib=DIR path to directory containing zlib library (default= |
1558 | 1561 |
/usr/local or /usr if not found in /usr/local) |
1559 |
- --with-gnu-ld assume the C compiler uses GNU ld default=no |
|
1560 | 1562 |
--with-libbz2-prefix[=DIR] search for libbz2 in DIR/include and DIR/lib |
1561 | 1563 |
--without-libbz2-prefix don't search for libbz2 in includedir and libdir |
1562 | 1564 |
--with-libgmp-prefix[=DIR] search for libgmp in DIR/include and DIR/lib |
... | ... |
@@ -1578,10 +1575,6 @@ Some influential environment variables: |
1578 | 1578 |
CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if |
1579 | 1579 |
you have headers in a nonstandard directory <include dir> |
1580 | 1580 |
CPP C preprocessor |
1581 |
- PKG_CONFIG path to pkg-config utility |
|
1582 |
- CHECK_CFLAGS |
|
1583 |
- C compiler flags for CHECK, overriding pkg-config |
|
1584 |
- CHECK_LIBS linker flags for CHECK, overriding pkg-config |
|
1585 | 1581 |
|
1586 | 1582 |
Use these variables to override the choices made by `configure' or to help |
1587 | 1583 |
it to find libraries and programs with nonstandard names/locations. |
... | ... |
@@ -4760,13 +4753,13 @@ if test "${lt_cv_nm_interface+set}" = set; then |
4760 | 4760 |
else |
4761 | 4761 |
lt_cv_nm_interface="BSD nm" |
4762 | 4762 |
echo "int some_variable = 0;" > conftest.$ac_ext |
4763 |
- (eval echo "\"\$as_me:4763: $ac_compile\"" >&5) |
|
4763 |
+ (eval echo "\"\$as_me:4756: $ac_compile\"" >&5) |
|
4764 | 4764 |
(eval "$ac_compile" 2>conftest.err) |
4765 | 4765 |
cat conftest.err >&5 |
4766 |
- (eval echo "\"\$as_me:4766: $NM \\\"conftest.$ac_objext\\\"\"" >&5) |
|
4766 |
+ (eval echo "\"\$as_me:4759: $NM \\\"conftest.$ac_objext\\\"\"" >&5) |
|
4767 | 4767 |
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) |
4768 | 4768 |
cat conftest.err >&5 |
4769 |
- (eval echo "\"\$as_me:4769: output\"" >&5) |
|
4769 |
+ (eval echo "\"\$as_me:4762: output\"" >&5) |
|
4770 | 4770 |
cat conftest.out >&5 |
4771 | 4771 |
if $GREP 'External.*some_variable' conftest.out > /dev/null; then |
4772 | 4772 |
lt_cv_nm_interface="MS dumpbin" |
... | ... |
@@ -5977,7 +5970,7 @@ ia64-*-hpux*) |
5977 | 5977 |
;; |
5978 | 5978 |
*-*-irix6*) |
5979 | 5979 |
# Find out which ABI we are using. |
5980 |
- echo '#line 5980 "configure"' > conftest.$ac_ext |
|
5980 |
+ echo '#line 5973 "configure"' > conftest.$ac_ext |
|
5981 | 5981 |
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
5982 | 5982 |
(eval $ac_compile) 2>&5 |
5983 | 5983 |
ac_status=$? |
... | ... |
@@ -7828,11 +7821,11 @@ else |
7828 | 7828 |
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
7829 | 7829 |
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
7830 | 7830 |
-e 's:$: $lt_compiler_flag:'` |
7831 |
- (eval echo "\"\$as_me:7831: $lt_compile\"" >&5) |
|
7831 |
+ (eval echo "\"\$as_me:7824: $lt_compile\"" >&5) |
|
7832 | 7832 |
(eval "$lt_compile" 2>conftest.err) |
7833 | 7833 |
ac_status=$? |
7834 | 7834 |
cat conftest.err >&5 |
7835 |
- echo "$as_me:7835: \$? = $ac_status" >&5 |
|
7835 |
+ echo "$as_me:7828: \$? = $ac_status" >&5 |
|
7836 | 7836 |
if (exit $ac_status) && test -s "$ac_outfile"; then |
7837 | 7837 |
# The compiler can only warn and ignore the option if not recognized |
7838 | 7838 |
# So say no if there are warnings other than the usual output. |
... | ... |
@@ -8167,11 +8160,11 @@ else |
8167 | 8167 |
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
8168 | 8168 |
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
8169 | 8169 |
-e 's:$: $lt_compiler_flag:'` |
8170 |
- (eval echo "\"\$as_me:8170: $lt_compile\"" >&5) |
|
8170 |
+ (eval echo "\"\$as_me:8163: $lt_compile\"" >&5) |
|
8171 | 8171 |
(eval "$lt_compile" 2>conftest.err) |
8172 | 8172 |
ac_status=$? |
8173 | 8173 |
cat conftest.err >&5 |
8174 |
- echo "$as_me:8174: \$? = $ac_status" >&5 |
|
8174 |
+ echo "$as_me:8167: \$? = $ac_status" >&5 |
|
8175 | 8175 |
if (exit $ac_status) && test -s "$ac_outfile"; then |
8176 | 8176 |
# The compiler can only warn and ignore the option if not recognized |
8177 | 8177 |
# So say no if there are warnings other than the usual output. |
... | ... |
@@ -8272,11 +8265,11 @@ else |
8272 | 8272 |
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
8273 | 8273 |
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
8274 | 8274 |
-e 's:$: $lt_compiler_flag:'` |
8275 |
- (eval echo "\"\$as_me:8275: $lt_compile\"" >&5) |
|
8275 |
+ (eval echo "\"\$as_me:8268: $lt_compile\"" >&5) |
|
8276 | 8276 |
(eval "$lt_compile" 2>out/conftest.err) |
8277 | 8277 |
ac_status=$? |
8278 | 8278 |
cat out/conftest.err >&5 |
8279 |
- echo "$as_me:8279: \$? = $ac_status" >&5 |
|
8279 |
+ echo "$as_me:8272: \$? = $ac_status" >&5 |
|
8280 | 8280 |
if (exit $ac_status) && test -s out/conftest2.$ac_objext |
8281 | 8281 |
then |
8282 | 8282 |
# The compiler can only warn and ignore the option if not recognized |
... | ... |
@@ -8327,11 +8320,11 @@ else |
8327 | 8327 |
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
8328 | 8328 |
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
8329 | 8329 |
-e 's:$: $lt_compiler_flag:'` |
8330 |
- (eval echo "\"\$as_me:8330: $lt_compile\"" >&5) |
|
8330 |
+ (eval echo "\"\$as_me:8323: $lt_compile\"" >&5) |
|
8331 | 8331 |
(eval "$lt_compile" 2>out/conftest.err) |
8332 | 8332 |
ac_status=$? |
8333 | 8333 |
cat out/conftest.err >&5 |
8334 |
- echo "$as_me:8334: \$? = $ac_status" >&5 |
|
8334 |
+ echo "$as_me:8327: \$? = $ac_status" >&5 |
|
8335 | 8335 |
if (exit $ac_status) && test -s out/conftest2.$ac_objext |
8336 | 8336 |
then |
8337 | 8337 |
# The compiler can only warn and ignore the option if not recognized |
... | ... |
@@ -11083,7 +11076,7 @@ else |
11083 | 11083 |
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
11084 | 11084 |
lt_status=$lt_dlunknown |
11085 | 11085 |
cat > conftest.$ac_ext <<_LT_EOF |
11086 |
-#line 11086 "configure" |
|
11086 |
+#line 11079 "configure" |
|
11087 | 11087 |
#include "confdefs.h" |
11088 | 11088 |
|
11089 | 11089 |
#if HAVE_DLFCN_H |
... | ... |
@@ -11179,7 +11172,7 @@ else |
11179 | 11179 |
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
11180 | 11180 |
lt_status=$lt_dlunknown |
11181 | 11181 |
cat > conftest.$ac_ext <<_LT_EOF |
11182 |
-#line 11182 "configure" |
|
11182 |
+#line 11175 "configure" |
|
11183 | 11183 |
#include "confdefs.h" |
11184 | 11184 |
|
11185 | 11185 |
#if HAVE_DLFCN_H |
... | ... |
@@ -13771,223 +13764,639 @@ fi |
13771 | 13771 |
|
13772 | 13772 |
if test "$enable_check_ut" != "no" ; then |
13773 | 13773 |
|
13774 |
- |
|
13775 |
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then |
|
13776 |
- if test -n "$ac_tool_prefix"; then |
|
13777 |
- # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. |
|
13778 |
-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 |
|
13779 |
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 |
|
13780 |
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } |
|
13781 |
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then |
|
13782 |
- echo $ECHO_N "(cached) $ECHO_C" >&6 |
|
13783 |
-else |
|
13784 |
- case $PKG_CONFIG in |
|
13785 |
- [\\/]* | ?:[\\/]*) |
|
13786 |
- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. |
|
13787 |
- ;; |
|
13788 |
- *) |
|
13789 |
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
|
13790 |
-for as_dir in $PATH |
|
13791 |
-do |
|
13792 |
- IFS=$as_save_IFS |
|
13793 |
- test -z "$as_dir" && as_dir=. |
|
13794 |
- for ac_exec_ext in '' $ac_executable_extensions; do |
|
13795 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
13796 |
- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" |
|
13797 |
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
|
13798 |
- break 2 |
|
13774 |
+ if test "X$prefix" = "XNONE"; then |
|
13775 |
+ acl_final_prefix="$ac_default_prefix" |
|
13776 |
+ else |
|
13777 |
+ acl_final_prefix="$prefix" |
|
13799 | 13778 |
fi |
13800 |
-done |
|
13801 |
-done |
|
13802 |
-IFS=$as_save_IFS |
|
13779 |
+ if test "X$exec_prefix" = "XNONE"; then |
|
13780 |
+ acl_final_exec_prefix='${prefix}' |
|
13781 |
+ else |
|
13782 |
+ acl_final_exec_prefix="$exec_prefix" |
|
13783 |
+ fi |
|
13784 |
+ acl_save_prefix="$prefix" |
|
13785 |
+ prefix="$acl_final_prefix" |
|
13786 |
+ eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" |
|
13787 |
+ prefix="$acl_save_prefix" |
|
13803 | 13788 |
|
13804 |
- ;; |
|
13805 |
-esac |
|
13806 |
-fi |
|
13807 |
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG |
|
13808 |
-if test -n "$PKG_CONFIG"; then |
|
13809 |
- { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 |
|
13810 |
-echo "${ECHO_T}$PKG_CONFIG" >&6; } |
|
13789 |
+ |
|
13790 |
+# Check whether --with-gnu-ld was given. |
|
13791 |
+if test "${with_gnu_ld+set}" = set; then |
|
13792 |
+ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes |
|
13811 | 13793 |
else |
13812 |
- { echo "$as_me:$LINENO: result: no" >&5 |
|
13813 |
-echo "${ECHO_T}no" >&6; } |
|
13794 |
+ with_gnu_ld=no |
|
13814 | 13795 |
fi |
13815 | 13796 |
|
13816 |
- |
|
13797 |
+# Prepare PATH_SEPARATOR. |
|
13798 |
+# The user is always right. |
|
13799 |
+if test "${PATH_SEPARATOR+set}" != set; then |
|
13800 |
+ echo "#! /bin/sh" >conf$$.sh |
|
13801 |
+ echo "exit 0" >>conf$$.sh |
|
13802 |
+ chmod +x conf$$.sh |
|
13803 |
+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then |
|
13804 |
+ PATH_SEPARATOR=';' |
|
13805 |
+ else |
|
13806 |
+ PATH_SEPARATOR=: |
|
13807 |
+ fi |
|
13808 |
+ rm -f conf$$.sh |
|
13817 | 13809 |
fi |
13818 |
-if test -z "$ac_cv_path_PKG_CONFIG"; then |
|
13819 |
- ac_pt_PKG_CONFIG=$PKG_CONFIG |
|
13820 |
- # Extract the first word of "pkg-config", so it can be a program name with args. |
|
13821 |
-set dummy pkg-config; ac_word=$2 |
|
13822 |
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 |
|
13823 |
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } |
|
13824 |
-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then |
|
13810 |
+ac_prog=ld |
|
13811 |
+if test "$GCC" = yes; then |
|
13812 |
+ # Check if gcc -print-prog-name=ld gives a path. |
|
13813 |
+ { echo "$as_me:$LINENO: checking for ld used by GCC" >&5 |
|
13814 |
+echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6; } |
|
13815 |
+ case $host in |
|
13816 |
+ *-*-mingw*) |
|
13817 |
+ # gcc leaves a trailing carriage return which upsets mingw |
|
13818 |
+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; |
|
13819 |
+ *) |
|
13820 |
+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; |
|
13821 |
+ esac |
|
13822 |
+ case $ac_prog in |
|
13823 |
+ # Accept absolute paths. |
|
13824 |
+ [\\/]* | [A-Za-z]:[\\/]*) |
|
13825 |
+ re_direlt='/[^/][^/]*/\.\./' |
|
13826 |
+ # Canonicalize the path of ld |
|
13827 |
+ ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` |
|
13828 |
+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do |
|
13829 |
+ ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` |
|
13830 |
+ done |
|
13831 |
+ test -z "$LD" && LD="$ac_prog" |
|
13832 |
+ ;; |
|
13833 |
+ "") |
|
13834 |
+ # If it fails, then pretend we aren't using GCC. |
|
13835 |
+ ac_prog=ld |
|
13836 |
+ ;; |
|
13837 |
+ *) |
|
13838 |
+ # If it is relative, then search for the first ld in PATH. |
|
13839 |
+ with_gnu_ld=unknown |
|
13840 |
+ ;; |
|
13841 |
+ esac |
|
13842 |
+elif test "$with_gnu_ld" = yes; then |
|
13843 |
+ { echo "$as_me:$LINENO: checking for GNU ld" >&5 |
|
13844 |
+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } |
|
13845 |
+else |
|
13846 |
+ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 |
|
13847 |
+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } |
|
13848 |
+fi |
|
13849 |
+if test "${acl_cv_path_LD+set}" = set; then |
|
13825 | 13850 |
echo $ECHO_N "(cached) $ECHO_C" >&6 |
13826 | 13851 |
else |
13827 |
- case $ac_pt_PKG_CONFIG in |
|
13828 |
- [\\/]* | ?:[\\/]*) |
|
13829 |
- ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. |
|
13830 |
- ;; |
|
13831 |
- *) |
|
13832 |
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
|
13833 |
-for as_dir in $PATH |
|
13834 |
-do |
|
13835 |
- IFS=$as_save_IFS |
|
13836 |
- test -z "$as_dir" && as_dir=. |
|
13837 |
- for ac_exec_ext in '' $ac_executable_extensions; do |
|
13838 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
13839 |
- ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" |
|
13840 |
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
|
13841 |
- break 2 |
|
13842 |
- fi |
|
13843 |
-done |
|
13844 |
-done |
|
13845 |
-IFS=$as_save_IFS |
|
13846 |
- |
|
13847 |
- ;; |
|
13848 |
-esac |
|
13852 |
+ if test -z "$LD"; then |
|
13853 |
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" |
|
13854 |
+ for ac_dir in $PATH; do |
|
13855 |
+ test -z "$ac_dir" && ac_dir=. |
|
13856 |
+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then |
|
13857 |
+ acl_cv_path_LD="$ac_dir/$ac_prog" |
|
13858 |
+ # Check to see if the program is GNU ld. I'd rather use --version, |
|
13859 |
+ # but apparently some GNU ld's only accept -v. |
|
13860 |
+ # Break only if it was the GNU/non-GNU ld that we prefer. |
|
13861 |
+ case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in |
|
13862 |
+ *GNU* | *'with BFD'*) |
|
13863 |
+ test "$with_gnu_ld" != no && break ;; |
|
13864 |
+ *) |
|
13865 |
+ test "$with_gnu_ld" != yes && break ;; |
|
13866 |
+ esac |
|
13867 |
+ fi |
|
13868 |
+ done |
|
13869 |
+ IFS="$ac_save_ifs" |
|
13870 |
+else |
|
13871 |
+ acl_cv_path_LD="$LD" # Let the user override the test with a path. |
|
13849 | 13872 |
fi |
13850 |
-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG |
|
13851 |
-if test -n "$ac_pt_PKG_CONFIG"; then |
|
13852 |
- { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 |
|
13853 |
-echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; } |
|
13873 |
+fi |
|
13874 |
+ |
|
13875 |
+LD="$acl_cv_path_LD" |
|
13876 |
+if test -n "$LD"; then |
|
13877 |
+ { echo "$as_me:$LINENO: result: $LD" >&5 |
|
13878 |
+echo "${ECHO_T}$LD" >&6; } |
|
13854 | 13879 |
else |
13855 | 13880 |
{ echo "$as_me:$LINENO: result: no" >&5 |
13856 | 13881 |
echo "${ECHO_T}no" >&6; } |
13857 | 13882 |
fi |
13858 |
- |
|
13859 |
- if test "x$ac_pt_PKG_CONFIG" = x; then |
|
13860 |
- PKG_CONFIG="" |
|
13861 |
- else |
|
13862 |
- case $cross_compiling:$ac_tool_warned in |
|
13863 |
-yes:) |
|
13864 |
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools |
|
13865 |
-whose name does not start with the host triplet. If you think this |
|
13866 |
-configuration is useful to you, please write to autoconf@gnu.org." >&5 |
|
13867 |
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools |
|
13868 |
-whose name does not start with the host triplet. If you think this |
|
13869 |
-configuration is useful to you, please write to autoconf@gnu.org." >&2;} |
|
13870 |
-ac_tool_warned=yes ;; |
|
13871 |
-esac |
|
13872 |
- PKG_CONFIG=$ac_pt_PKG_CONFIG |
|
13873 |
- fi |
|
13883 |
+test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 |
|
13884 |
+echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} |
|
13885 |
+ { (exit 1); exit 1; }; } |
|
13886 |
+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 |
|
13887 |
+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } |
|
13888 |
+if test "${acl_cv_prog_gnu_ld+set}" = set; then |
|
13889 |
+ echo $ECHO_N "(cached) $ECHO_C" >&6 |
|
13874 | 13890 |
else |
13875 |
- PKG_CONFIG="$ac_cv_path_PKG_CONFIG" |
|
13891 |
+ # I'd rather use --version here, but apparently some GNU ld's only accept -v. |
|
13892 |
+case `$LD -v 2>&1 </dev/null` in |
|
13893 |
+*GNU* | *'with BFD'*) |
|
13894 |
+ acl_cv_prog_gnu_ld=yes ;; |
|
13895 |
+*) |
|
13896 |
+ acl_cv_prog_gnu_ld=no ;; |
|
13897 |
+esac |
|
13876 | 13898 |
fi |
13899 |
+{ echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5 |
|
13900 |
+echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6; } |
|
13901 |
+with_gnu_ld=$acl_cv_prog_gnu_ld |
|
13877 | 13902 |
|
13878 |
-fi |
|
13879 |
-if test -n "$PKG_CONFIG"; then |
|
13880 |
- _pkg_min_version=0.9.0 |
|
13881 |
- { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 |
|
13882 |
-echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; } |
|
13883 |
- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then |
|
13884 |
- { echo "$as_me:$LINENO: result: yes" >&5 |
|
13885 |
-echo "${ECHO_T}yes" >&6; } |
|
13886 |
- else |
|
13887 |
- { echo "$as_me:$LINENO: result: no" >&5 |
|
13888 |
-echo "${ECHO_T}no" >&6; } |
|
13889 |
- PKG_CONFIG="" |
|
13890 |
- fi |
|
13891 | 13903 |
|
13892 |
-fi |
|
13893 | 13904 |
|
13894 |
-pkg_failed=no |
|
13895 |
-{ echo "$as_me:$LINENO: checking for CHECK" >&5 |
|
13896 |
-echo $ECHO_N "checking for CHECK... $ECHO_C" >&6; } |
|
13897 | 13905 |
|
13898 |
-if test -n "$PKG_CONFIG"; then |
|
13899 |
- if test -n "$CHECK_CFLAGS"; then |
|
13900 |
- pkg_cv_CHECK_CFLAGS="$CHECK_CFLAGS" |
|
13901 |
- else |
|
13902 |
- if test -n "$PKG_CONFIG" && \ |
|
13903 |
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"check\"") >&5 |
|
13904 |
- ($PKG_CONFIG --exists --print-errors "check") 2>&5 |
|
13905 |
- ac_status=$? |
|
13906 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
|
13907 |
- (exit $ac_status); }; then |
|
13908 |
- pkg_cv_CHECK_CFLAGS=`$PKG_CONFIG --cflags "check" 2>/dev/null` |
|
13909 |
-else |
|
13910 |
- pkg_failed=yes |
|
13911 |
-fi |
|
13912 |
- fi |
|
13913 |
-else |
|
13914 |
- pkg_failed=untried |
|
13915 |
-fi |
|
13916 |
-if test -n "$PKG_CONFIG"; then |
|
13917 |
- if test -n "$CHECK_LIBS"; then |
|
13918 |
- pkg_cv_CHECK_LIBS="$CHECK_LIBS" |
|
13919 |
- else |
|
13920 |
- if test -n "$PKG_CONFIG" && \ |
|
13921 |
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"check\"") >&5 |
|
13922 |
- ($PKG_CONFIG --exists --print-errors "check") 2>&5 |
|
13923 |
- ac_status=$? |
|
13924 |
- echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
|
13925 |
- (exit $ac_status); }; then |
|
13926 |
- pkg_cv_CHECK_LIBS=`$PKG_CONFIG --libs "check" 2>/dev/null` |
|
13906 |
+ { echo "$as_me:$LINENO: checking for shared library run path origin" >&5 |
|
13907 |
+echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6; } |
|
13908 |
+if test "${acl_cv_rpath+set}" = set; then |
|
13909 |
+ echo $ECHO_N "(cached) $ECHO_C" >&6 |
|
13927 | 13910 |
else |
13928 |
- pkg_failed=yes |
|
13911 |
+ |
|
13912 |
+ CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ |
|
13913 |
+ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh |
|
13914 |
+ . ./conftest.sh |
|
13915 |
+ rm -f ./conftest.sh |
|
13916 |
+ acl_cv_rpath=done |
|
13917 |
+ |
|
13929 | 13918 |
fi |
13930 |
- fi |
|
13919 |
+{ echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5 |
|
13920 |
+echo "${ECHO_T}$acl_cv_rpath" >&6; } |
|
13921 |
+ wl="$acl_cv_wl" |
|
13922 |
+ acl_libext="$acl_cv_libext" |
|
13923 |
+ acl_shlibext="$acl_cv_shlibext" |
|
13924 |
+ acl_libname_spec="$acl_cv_libname_spec" |
|
13925 |
+ acl_library_names_spec="$acl_cv_library_names_spec" |
|
13926 |
+ acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" |
|
13927 |
+ acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" |
|
13928 |
+ acl_hardcode_direct="$acl_cv_hardcode_direct" |
|
13929 |
+ acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" |
|
13930 |
+ # Check whether --enable-rpath was given. |
|
13931 |
+if test "${enable_rpath+set}" = set; then |
|
13932 |
+ enableval=$enable_rpath; : |
|
13931 | 13933 |
else |
13932 |
- pkg_failed=untried |
|
13934 |
+ enable_rpath=yes |
|
13933 | 13935 |
fi |
13934 | 13936 |
|
13935 | 13937 |
|
13936 | 13938 |
|
13937 |
-if test $pkg_failed = yes; then |
|
13939 |
+ acl_libdirstem=lib |
|
13940 |
+ searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` |
|
13941 |
+ if test -n "$searchpath"; then |
|
13942 |
+ acl_save_IFS="${IFS= }"; IFS=":" |
|
13943 |
+ for searchdir in $searchpath; do |
|
13944 |
+ if test -d "$searchdir"; then |
|
13945 |
+ case "$searchdir" in |
|
13946 |
+ */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; |
|
13947 |
+ *) searchdir=`cd "$searchdir" && pwd` |
|
13948 |
+ case "$searchdir" in |
|
13949 |
+ */lib64 ) acl_libdirstem=lib64 ;; |
|
13950 |
+ esac ;; |
|
13951 |
+ esac |
|
13952 |
+ fi |
|
13953 |
+ done |
|
13954 |
+ IFS="$acl_save_IFS" |
|
13955 |
+ fi |
|
13956 |
+ |
|
13957 |
+ |
|
13958 |
+ |
|
13938 | 13959 |
|
13939 |
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
|
13940 |
- _pkg_short_errors_supported=yes |
|
13960 |
+ |
|
13961 |
+ |
|
13962 |
+ { echo "$as_me:$LINENO: checking how to compile and link with check" >&5 |
|
13963 |
+echo $ECHO_N "checking how to compile and link with check... $ECHO_C" >&6; } |
|
13964 |
+if test "${ac_cv_findlib_CHECK_libs+set}" = set; then |
|
13965 |
+ echo $ECHO_N "(cached) $ECHO_C" >&6 |
|
13941 | 13966 |
else |
13942 |
- _pkg_short_errors_supported=no |
|
13967 |
+ |
|
13968 |
+ save_CPPFLAGS="$CPPFLAGS" |
|
13969 |
+ save_LIBS="$LIBS" |
|
13970 |
+ |
|
13971 |
+ |
|
13972 |
+ |
|
13973 |
+ |
|
13974 |
+ use_additional=yes |
|
13975 |
+ |
|
13976 |
+ acl_save_prefix="$prefix" |
|
13977 |
+ prefix="$acl_final_prefix" |
|
13978 |
+ acl_save_exec_prefix="$exec_prefix" |
|
13979 |
+ exec_prefix="$acl_final_exec_prefix" |
|
13980 |
+ |
|
13981 |
+ eval additional_includedir=\"$includedir\" |
|
13982 |
+ eval additional_libdir=\"$libdir\" |
|
13983 |
+ |
|
13984 |
+ exec_prefix="$acl_save_exec_prefix" |
|
13985 |
+ prefix="$acl_save_prefix" |
|
13986 |
+ |
|
13987 |
+ |
|
13988 |
+# Check whether --with-libcheck-prefix was given. |
|
13989 |
+if test "${with_libcheck_prefix+set}" = set; then |
|
13990 |
+ withval=$with_libcheck_prefix; |
|
13991 |
+ if test "X$withval" = "Xno"; then |
|
13992 |
+ use_additional=no |
|
13993 |
+ else |
|
13994 |
+ if test "X$withval" = "X"; then |
|
13995 |
+ |
|
13996 |
+ acl_save_prefix="$prefix" |
|
13997 |
+ prefix="$acl_final_prefix" |
|
13998 |
+ acl_save_exec_prefix="$exec_prefix" |
|
13999 |
+ exec_prefix="$acl_final_exec_prefix" |
|
14000 |
+ |
|
14001 |
+ eval additional_includedir=\"$includedir\" |
|
14002 |
+ eval additional_libdir=\"$libdir\" |
|
14003 |
+ |
|
14004 |
+ exec_prefix="$acl_save_exec_prefix" |
|
14005 |
+ prefix="$acl_save_prefix" |
|
14006 |
+ |
|
14007 |
+ else |
|
14008 |
+ additional_includedir="$withval/include" |
|
14009 |
+ additional_libdir="$withval/$acl_libdirstem" |
|
14010 |
+ fi |
|
14011 |
+ fi |
|
14012 |
+ |
|
13943 | 14013 |
fi |
13944 |
- if test $_pkg_short_errors_supported = yes; then |
|
13945 |
- CHECK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "check"` |
|
14014 |
+ |
|
14015 |
+ LIBCHECK= |
|
14016 |
+ LTLIBCHECK= |
|
14017 |
+ INCCHECK= |
|
14018 |
+ LIBCHECK_PREFIX= |
|
14019 |
+ rpathdirs= |
|
14020 |
+ ltrpathdirs= |
|
14021 |
+ names_already_handled= |
|
14022 |
+ names_next_round='check ' |
|
14023 |
+ while test -n "$names_next_round"; do |
|
14024 |
+ names_this_round="$names_next_round" |
|
14025 |
+ names_next_round= |
|
14026 |
+ for name in $names_this_round; do |
|
14027 |
+ already_handled= |
|
14028 |
+ for n in $names_already_handled; do |
|
14029 |
+ if test "$n" = "$name"; then |
|
14030 |
+ already_handled=yes |
|
14031 |
+ break |
|
14032 |
+ fi |
|
14033 |
+ done |
|
14034 |
+ if test -z "$already_handled"; then |
|
14035 |
+ names_already_handled="$names_already_handled $name" |
|
14036 |
+ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` |
|
14037 |
+ eval value=\"\$HAVE_LIB$uppername\" |
|
14038 |
+ if test -n "$value"; then |
|
14039 |
+ if test "$value" = yes; then |
|
14040 |
+ eval value=\"\$LIB$uppername\" |
|
14041 |
+ test -z "$value" || LIBCHECK="${LIBCHECK}${LIBCHECK:+ }$value" |
|
14042 |
+ eval value=\"\$LTLIB$uppername\" |
|
14043 |
+ test -z "$value" || LTLIBCHECK="${LTLIBCHECK}${LTLIBCHECK:+ }$value" |
|
14044 |
+ else |
|
14045 |
+ : |
|
14046 |
+ fi |
|
13946 | 14047 |
else |
13947 |
- CHECK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "check"` |
|
14048 |
+ found_dir= |
|
14049 |
+ found_la= |
|
14050 |
+ found_so= |
|
14051 |
+ found_a= |
|
14052 |
+ eval libname=\"$acl_libname_spec\" # typically: libname=lib$name |
|
14053 |
+ if test -n "$acl_shlibext"; then |
|
14054 |
+ shrext=".$acl_shlibext" # typically: shrext=.so |
|
14055 |
+ else |
|
14056 |
+ shrext= |
|
14057 |
+ fi |
|
14058 |
+ if test $use_additional = yes; then |
|
14059 |
+ dir="$additional_libdir" |
|
14060 |
+ if test -n "$acl_shlibext"; then |
|
14061 |
+ if test -f "$dir/$libname$shrext"; then |
|
14062 |
+ found_dir="$dir" |
|
14063 |
+ found_so="$dir/$libname$shrext" |
|
14064 |
+ else |
|
14065 |
+ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then |
|
14066 |
+ ver=`(cd "$dir" && \ |
|
14067 |
+ for f in "$libname$shrext".*; do echo "$f"; done \ |
|
14068 |
+ | sed -e "s,^$libname$shrext\\\\.,," \ |
|
14069 |
+ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ |
|
14070 |
+ | sed 1q ) 2>/dev/null` |
|
14071 |
+ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then |
|
14072 |
+ found_dir="$dir" |
|
14073 |
+ found_so="$dir/$libname$shrext.$ver" |
|
14074 |
+ fi |
|
14075 |
+ else |
|
14076 |
+ eval library_names=\"$acl_library_names_spec\" |
|
14077 |
+ for f in $library_names; do |
|
14078 |
+ if test -f "$dir/$f"; then |
|
14079 |
+ found_dir="$dir" |
|
14080 |
+ found_so="$dir/$f" |
|
14081 |
+ break |
|
14082 |
+ fi |
|
14083 |
+ done |
|
14084 |
+ fi |
|
14085 |
+ fi |
|
14086 |
+ fi |
|
14087 |
+ if test "X$found_dir" = "X"; then |
|
14088 |
+ if test -f "$dir/$libname.$acl_libext"; then |
|
14089 |
+ found_dir="$dir" |
|
14090 |
+ found_a="$dir/$libname.$acl_libext" |
|
14091 |
+ fi |
|
14092 |
+ fi |
|
14093 |
+ if test "X$found_dir" != "X"; then |
|
14094 |
+ if test -f "$dir/$libname.la"; then |
|
14095 |
+ found_la="$dir/$libname.la" |
|
14096 |
+ fi |
|
14097 |
+ fi |
|
14098 |
+ fi |
|
14099 |
+ if test "X$found_dir" = "X"; then |
|
14100 |
+ for x in $LDFLAGS $LTLIBCHECK; do |
|
14101 |
+ |
|
14102 |
+ acl_save_prefix="$prefix" |
|
14103 |
+ prefix="$acl_final_prefix" |
|
14104 |
+ acl_save_exec_prefix="$exec_prefix" |
|
14105 |
+ exec_prefix="$acl_final_exec_prefix" |
|
14106 |
+ eval x=\"$x\" |
|
14107 |
+ exec_prefix="$acl_save_exec_prefix" |
|
14108 |
+ prefix="$acl_save_prefix" |
|
14109 |
+ |
|
14110 |
+ case "$x" in |
|
14111 |
+ -L*) |
|
14112 |
+ dir=`echo "X$x" | sed -e 's/^X-L//'` |
|
14113 |
+ if test -n "$acl_shlibext"; then |
|
14114 |
+ if test -f "$dir/$libname$shrext"; then |
|
14115 |
+ found_dir="$dir" |
|
14116 |
+ found_so="$dir/$libname$shrext" |
|
14117 |
+ else |
|
14118 |
+ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then |
|
14119 |
+ ver=`(cd "$dir" && \ |
|
14120 |
+ for f in "$libname$shrext".*; do echo "$f"; done \ |
|
14121 |
+ | sed -e "s,^$libname$shrext\\\\.,," \ |
|
14122 |
+ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ |
|
14123 |
+ | sed 1q ) 2>/dev/null` |
|
14124 |
+ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then |
|
14125 |
+ found_dir="$dir" |
|
14126 |
+ found_so="$dir/$libname$shrext.$ver" |
|
14127 |
+ fi |
|
14128 |
+ else |
|
14129 |
+ eval library_names=\"$acl_library_names_spec\" |
|
14130 |
+ for f in $library_names; do |
|
14131 |
+ if test -f "$dir/$f"; then |
|
14132 |
+ found_dir="$dir" |
|
14133 |
+ found_so="$dir/$f" |
|
14134 |
+ break |
|
14135 |
+ fi |
|
14136 |
+ done |
|
14137 |
+ fi |
|
14138 |
+ fi |
|
14139 |
+ fi |
|
14140 |
+ if test "X$found_dir" = "X"; then |
|
14141 |
+ if test -f "$dir/$libname.$acl_libext"; then |
|
14142 |
+ found_dir="$dir" |
|
14143 |
+ found_a="$dir/$libname.$acl_libext" |
|
14144 |
+ fi |
|
14145 |
+ fi |
|
14146 |
+ if test "X$found_dir" != "X"; then |
|
14147 |
+ if test -f "$dir/$libname.la"; then |
|
14148 |
+ found_la="$dir/$libname.la" |
|
14149 |
+ fi |
|
14150 |
+ fi |
|
14151 |
+ ;; |
|
14152 |
+ esac |
|
14153 |
+ if test "X$found_dir" != "X"; then |
|
14154 |
+ break |
|
14155 |
+ fi |
|
14156 |
+ done |
|
14157 |
+ fi |
|
14158 |
+ if test "X$found_dir" != "X"; then |
|
14159 |
+ LTLIBCHECK="${LTLIBCHECK}${LTLIBCHECK:+ }-L$found_dir -l$name" |
|
14160 |
+ if test "X$found_so" != "X"; then |
|
14161 |
+ if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then |
|
14162 |
+ LIBCHECK="${LIBCHECK}${LIBCHECK:+ }$found_so" |
|
14163 |
+ else |
|
14164 |
+ haveit= |
|
14165 |
+ for x in $ltrpathdirs; do |
|
14166 |
+ if test "X$x" = "X$found_dir"; then |
|
14167 |
+ haveit=yes |
|
14168 |
+ break |
|
14169 |
+ fi |
|
14170 |
+ done |
|
14171 |
+ if test -z "$haveit"; then |
|
14172 |
+ ltrpathdirs="$ltrpathdirs $found_dir" |
|
14173 |
+ fi |
|
14174 |
+ if test "$acl_hardcode_direct" = yes; then |
|
14175 |
+ LIBCHECK="${LIBCHECK}${LIBCHECK:+ }$found_so" |
|
14176 |
+ else |
|
14177 |
+ if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then |
|
14178 |
+ LIBCHECK="${LIBCHECK}${LIBCHECK:+ }$found_so" |
|
14179 |
+ haveit= |
|
14180 |
+ for x in $rpathdirs; do |
|
14181 |
+ if test "X$x" = "X$found_dir"; then |
|
14182 |
+ haveit=yes |
|
14183 |
+ break |
|
14184 |
+ fi |
|
14185 |
+ done |
|
14186 |
+ if test -z "$haveit"; then |
|
14187 |
+ rpathdirs="$rpathdirs $found_dir" |
|
14188 |
+ fi |
|
14189 |
+ else |
|
14190 |
+ haveit= |
|
14191 |
+ for x in $LDFLAGS $LIBCHECK; do |
|
14192 |
+ |
|
14193 |
+ acl_save_prefix="$prefix" |
|
14194 |
+ prefix="$acl_final_prefix" |
|
14195 |
+ acl_save_exec_prefix="$exec_prefix" |
|
14196 |
+ exec_prefix="$acl_final_exec_prefix" |
|
14197 |
+ eval x=\"$x\" |
|
14198 |
+ exec_prefix="$acl_save_exec_prefix" |
|
14199 |
+ prefix="$acl_save_prefix" |
|
14200 |
+ |
|
14201 |
+ if test "X$x" = "X-L$found_dir"; then |
|
14202 |
+ haveit=yes |
|
14203 |
+ break |
|
14204 |
+ fi |
|
14205 |
+ done |
|
14206 |
+ if test -z "$haveit"; then |
|
14207 |
+ LIBCHECK="${LIBCHECK}${LIBCHECK:+ }-L$found_dir" |
|
14208 |
+ fi |
|
14209 |
+ if test "$acl_hardcode_minus_L" != no; then |
|
14210 |
+ LIBCHECK="${LIBCHECK}${LIBCHECK:+ }$found_so" |
|
14211 |
+ else |
|
14212 |
+ LIBCHECK="${LIBCHECK}${LIBCHECK:+ }-l$name" |
|
14213 |
+ fi |
|
14214 |
+ fi |
|
14215 |
+ fi |
|
14216 |
+ fi |
|
14217 |
+ else |
|
14218 |
+ if test "X$found_a" != "X"; then |
|
14219 |
+ LIBCHECK="${LIBCHECK}${LIBCHECK:+ }$found_a" |
|
14220 |
+ else |
|
14221 |
+ LIBCHECK="${LIBCHECK}${LIBCHECK:+ }-L$found_dir -l$name" |
|
14222 |
+ fi |
|
14223 |
+ fi |
|
14224 |
+ additional_includedir= |
|
14225 |
+ case "$found_dir" in |
|
14226 |
+ */$acl_libdirstem | */$acl_libdirstem/) |
|
14227 |
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` |
|
14228 |
+ LIBCHECK_PREFIX="$basedir" |
|
14229 |
+ additional_includedir="$basedir/include" |
|
14230 |
+ ;; |
|
14231 |
+ esac |
|
14232 |
+ if test "X$additional_includedir" != "X"; then |
|
14233 |
+ if test "X$additional_includedir" != "X/usr/include"; then |
|
14234 |
+ haveit= |
|
14235 |
+ if test "X$additional_includedir" = "X/usr/local/include"; then |
|
14236 |
+ if test -n "$GCC"; then |
|
14237 |
+ case $host_os in |
|
14238 |
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;; |
|
14239 |
+ esac |
|
14240 |
+ fi |
|
14241 |
+ fi |
|
14242 |
+ if test -z "$haveit"; then |
|
14243 |
+ for x in $CPPFLAGS $INCCHECK; do |
|
14244 |
+ |
|
14245 |
+ acl_save_prefix="$prefix" |
|
14246 |
+ prefix="$acl_final_prefix" |
|
14247 |
+ acl_save_exec_prefix="$exec_prefix" |
|
14248 |
+ exec_prefix="$acl_final_exec_prefix" |
|
14249 |
+ eval x=\"$x\" |
|
14250 |
+ exec_prefix="$acl_save_exec_prefix" |
|
14251 |
+ prefix="$acl_save_prefix" |
|
14252 |
+ |
|
14253 |
+ if test "X$x" = "X-I$additional_includedir"; then |
|
14254 |
+ haveit=yes |
|
14255 |
+ break |
|
14256 |
+ fi |
|
14257 |
+ done |
|
14258 |
+ if test -z "$haveit"; then |
|
14259 |
+ if test -d "$additional_includedir"; then |
|
14260 |
+ INCCHECK="${INCCHECK}${INCCHECK:+ }-I$additional_includedir" |
|
14261 |
+ fi |
|
14262 |
+ fi |
|
14263 |
+ fi |
|
14264 |
+ fi |
|
14265 |
+ fi |
|
14266 |
+ if test -n "$found_la"; then |
|
14267 |
+ save_libdir="$libdir" |
|
14268 |
+ case "$found_la" in |
|
14269 |
+ */* | *\\*) . "$found_la" ;; |
|
14270 |
+ *) . "./$found_la" ;; |
|
14271 |
+ esac |
|
14272 |
+ libdir="$save_libdir" |
|
14273 |
+ for dep in $dependency_libs; do |
|
14274 |
+ case "$dep" in |
|
14275 |
+ -L*) |
|
14276 |
+ additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` |
|
14277 |
+ if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then |
|
14278 |
+ haveit= |
|
14279 |
+ if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then |
|
14280 |
+ if test -n "$GCC"; then |
|
14281 |
+ case $host_os in |
|
14282 |
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;; |
|
14283 |
+ esac |
|
14284 |
+ fi |
|
14285 |
+ fi |
|
14286 |
+ if test -z "$haveit"; then |
|
14287 |
+ haveit= |
|
14288 |
+ for x in $LDFLAGS $LIBCHECK; do |
|
14289 |
+ |
|
14290 |
+ acl_save_prefix="$prefix" |
|
14291 |
+ prefix="$acl_final_prefix" |
|
14292 |
+ acl_save_exec_prefix="$exec_prefix" |
|
14293 |
+ exec_prefix="$acl_final_exec_prefix" |
|
14294 |
+ eval x=\"$x\" |
|
14295 |
+ exec_prefix="$acl_save_exec_prefix" |
|
14296 |
+ prefix="$acl_save_prefix" |
|
14297 |
+ |
|
14298 |
+ if test "X$x" = "X-L$additional_libdir"; then |
|
14299 |
+ haveit=yes |
|
14300 |
+ break |
|
14301 |
+ fi |
|
14302 |
+ done |
|
14303 |
+ if test -z "$haveit"; then |
|
14304 |
+ if test -d "$additional_libdir"; then |
|
14305 |
+ LIBCHECK="${LIBCHECK}${LIBCHECK:+ }-L$additional_libdir" |
|
14306 |
+ fi |
|
14307 |
+ fi |
|
14308 |
+ haveit= |
|
14309 |
+ for x in $LDFLAGS $LTLIBCHECK; do |
|
14310 |
+ |
|
14311 |
+ acl_save_prefix="$prefix" |
|
14312 |
+ prefix="$acl_final_prefix" |
|
14313 |
+ acl_save_exec_prefix="$exec_prefix" |
|
14314 |
+ exec_prefix="$acl_final_exec_prefix" |
|
14315 |
+ eval x=\"$x\" |
|
14316 |
+ exec_prefix="$acl_save_exec_prefix" |
|
14317 |
+ prefix="$acl_save_prefix" |
|
14318 |
+ |
|
14319 |
+ if test "X$x" = "X-L$additional_libdir"; then |
|
14320 |
+ haveit=yes |
|
14321 |
+ break |
|
14322 |
+ fi |
|
14323 |
+ done |
|
14324 |
+ if test -z "$haveit"; then |
|
14325 |
+ if test -d "$additional_libdir"; then |
|
14326 |
+ LTLIBCHECK="${LTLIBCHECK}${LTLIBCHECK:+ }-L$additional_libdir" |
|
14327 |
+ fi |
|
14328 |
+ fi |
|
14329 |
+ fi |
|
14330 |
+ fi |
|
14331 |
+ ;; |
|
14332 |
+ -R*) |
|
14333 |
+ dir=`echo "X$dep" | sed -e 's/^X-R//'` |
|
14334 |
+ if test "$enable_rpath" != no; then |
|
14335 |
+ haveit= |
|
14336 |
+ for x in $rpathdirs; do |
|
14337 |
+ if test "X$x" = "X$dir"; then |
|
14338 |
+ haveit=yes |
|
14339 |
+ break |
|
14340 |
+ fi |
|
14341 |
+ done |
|
14342 |
+ if test -z "$haveit"; then |
|
14343 |
+ rpathdirs="$rpathdirs $dir" |
|
14344 |
+ fi |
|
14345 |
+ haveit= |
|
14346 |
+ for x in $ltrpathdirs; do |
|
14347 |
+ if test "X$x" = "X$dir"; then |
|
14348 |
+ haveit=yes |
|
14349 |
+ break |
|
14350 |
+ fi |
|
14351 |
+ done |
|
14352 |
+ if test -z "$haveit"; then |
|
14353 |
+ ltrpathdirs="$ltrpathdirs $dir" |
|
14354 |
+ fi |
|
14355 |
+ fi |
|
14356 |
+ ;; |
|
14357 |
+ -l*) |
|
14358 |
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` |
|
14359 |
+ ;; |
|
14360 |
+ *.la) |
|
14361 |
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` |
|
14362 |
+ ;; |
|
14363 |
+ *) |
|
14364 |
+ LIBCHECK="${LIBCHECK}${LIBCHECK:+ }$dep" |
|
14365 |
+ LTLIBCHECK="${LTLIBCHECK}${LTLIBCHECK:+ }$dep" |
|
14366 |
+ ;; |
|
14367 |
+ esac |
|
14368 |
+ done |
|
14369 |
+ fi |
|
14370 |
+ else |
|
14371 |
+ LIBCHECK="${LIBCHECK}${LIBCHECK:+ }-l$name" |
|
14372 |
+ LTLIBCHECK="${LTLIBCHECK}${LTLIBCHECK:+ }-l$name" |
|
14373 |
+ fi |
|
13948 | 14374 |
fi |
13949 |
- # Put the nasty error message in config.log where it belongs |
|
13950 |
- echo "$CHECK_PKG_ERRORS" >&5 |
|
14375 |
+ fi |
|
14376 |
+ done |
|
14377 |
+ done |
|
14378 |
+ if test "X$rpathdirs" != "X"; then |
|
14379 |
+ if test -n "$acl_hardcode_libdir_separator"; then |
|
14380 |
+ alldirs= |
|
14381 |
+ for found_dir in $rpathdirs; do |
|
14382 |
+ alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" |
|
14383 |
+ done |
|
14384 |
+ acl_save_libdir="$libdir" |
|
14385 |
+ libdir="$alldirs" |
|
14386 |
+ eval flag=\"$acl_hardcode_libdir_flag_spec\" |
|
14387 |
+ libdir="$acl_save_libdir" |
|
14388 |
+ LIBCHECK="${LIBCHECK}${LIBCHECK:+ }$flag" |
|
14389 |
+ else |
|
14390 |
+ for found_dir in $rpathdirs; do |
|
14391 |
+ acl_save_libdir="$libdir" |
|
14392 |
+ libdir="$found_dir" |
|
14393 |
+ eval flag=\"$acl_hardcode_libdir_flag_spec\" |
|
14394 |
+ libdir="$acl_save_libdir" |
|
14395 |
+ LIBCHECK="${LIBCHECK}${LIBCHECK:+ }$flag" |
|
14396 |
+ done |
|
14397 |
+ fi |
|
14398 |
+ fi |
|
14399 |
+ if test "X$ltrpathdirs" != "X"; then |
|
14400 |
+ for found_dir in $ltrpathdirs; do |
|
14401 |
+ LTLIBCHECK="${LTLIBCHECK}${LTLIBCHECK:+ }-R$found_dir" |
|
14402 |
+ done |
|
14403 |
+ fi |
|
13951 | 14404 |
|
13952 |
- { echo "$as_me:$LINENO: result: no" >&5 |
|
13953 |
-echo "${ECHO_T}no" >&6; } |
|
13954 |
- { echo "$as_me:$LINENO: WARNING: unable to find 'check' using pkg-config: |
|
13955 |
-$CHECK_PKG_ERRORS |
|
13956 |
-Alternatively, you may set the environment variables CHECK_CFLAGS |
|
13957 |
-and CHECK_LIBS to avoid the need to call pkg-config. |
|
13958 |
-See the pkg-config man page for more details." >&5 |
|
13959 |
-echo "$as_me: WARNING: unable to find 'check' using pkg-config: |
|
13960 |
-$CHECK_PKG_ERRORS |
|
13961 |
-Alternatively, you may set the environment variables CHECK_CFLAGS |
|
13962 |
-and CHECK_LIBS to avoid the need to call pkg-config. |
|
13963 |
-See the pkg-config man page for more details." >&2;} |
|
13964 |
-elif test $pkg_failed = untried; then |
|
13965 |
- { echo "$as_me:$LINENO: WARNING: unable to find 'check' using pkg-config: |
|
13966 |
-$CHECK_PKG_ERRORS |
|
13967 |
-Alternatively, you may set the environment variables CHECK_CFLAGS |
|
13968 |
-and CHECK_LIBS to avoid the need to call pkg-config. |
|
13969 |
-See the pkg-config man page for more details." >&5 |
|
13970 |
-echo "$as_me: WARNING: unable to find 'check' using pkg-config: |
|
13971 |
-$CHECK_PKG_ERRORS |
|
13972 |
-Alternatively, you may set the environment variables CHECK_CFLAGS |
|
13973 |
-and CHECK_LIBS to avoid the need to call pkg-config. |
|
13974 |
-See the pkg-config man page for more details." >&2;} |
|
13975 |
-else |
|
13976 |
- CHECK_CFLAGS=$pkg_cv_CHECK_CFLAGS |
|
13977 |
- CHECK_LIBS=$pkg_cv_CHECK_LIBS |
|
13978 |
- { echo "$as_me:$LINENO: result: yes" >&5 |
|
13979 |
-echo "${ECHO_T}yes" >&6; } |
|
13980 |
- : |
|
13981 |
-fi |
|
13982 |
- save_CPPFLAGS="$CPPFLAGS"; |
|
13983 |
- CPPFLAGS="$CPPFLAGS $CHECK_CFLAGS" |
|
13984 |
- save_LIBS="$LIBS" |
|
13985 |
- if test -z "$CHECK_LIBS"; then |
|
13986 |
- # when pkg-config is not available, use defaults |
|
13987 |
- CHECK_LIBS="-lcheck" |
|
13988 |
- fi |
|
13989 |
- LIBS="$LIBS $CHECK_LIBS" |
|
13990 |
- if test "${ac_cv_header_check_h+set}" = set; then |
|
14405 |
+ CPPFLAGS="$CPPFLAGS $INCCHECK" |
|
14406 |
+ if test "${ac_cv_header_check_h+set}" = set; then |
|
13991 | 14407 |
{ echo "$as_me:$LINENO: checking for check.h" >&5 |
13992 | 14408 |
echo $ECHO_N "checking for check.h... $ECHO_C" >&6; } |
13993 | 14409 |
if test "${ac_cv_header_check_h+set}" = set; then |
... | ... |
@@ -14118,7 +14527,17 @@ echo "${ECHO_T}$ac_cv_header_check_h" >&6; } |
14118 | 14118 |
|
14119 | 14119 |
fi |
14120 | 14120 |
if test $ac_cv_header_check_h = yes; then |
14121 |
+ have_header=yes |
|
14122 |
+else |
|
14123 |
+ have_header=no |
|
14124 |
+fi |
|
14121 | 14125 |
|
14126 |
+ |
|
14127 |
+ ac_cv_findlib_CHECK_libs= |
|
14128 |
+ ac_cv_findlib_CHECK_inc= |
|
14129 |
+ if test "$have_header" = "yes"; then |
|
14130 |
+ |
|
14131 |
+ LIBS="$LIBS $LIBCHECK" |
|
14122 | 14132 |
{ echo "$as_me:$LINENO: checking linking with check" >&5 |
14123 | 14133 |
echo $ECHO_N "checking linking with check... $ECHO_C" >&6; } |
14124 | 14134 |
cat >conftest.$ac_ext <<_ACEOF |
... | ... |
@@ -14127,18 +14546,11 @@ _ACEOF |
14127 | 14127 |
cat confdefs.h >>conftest.$ac_ext |
14128 | 14128 |
cat >>conftest.$ac_ext <<_ACEOF |
14129 | 14129 |
/* end confdefs.h. */ |
14130 |
- |
|
14131 |
-/* Override any GCC internal prototype to avoid an error. |
|
14132 |
- Use char because int might match the return type of a GCC |
|
14133 |
- builtin and then its argument prototype would still apply. */ |
|
14134 |
-#ifdef __cplusplus |
|
14135 |
-extern "C" |
|
14136 |
-#endif |
|
14137 |
-char srunner_create (); |
|
14130 |
+#include <check.h> |
|
14138 | 14131 |
int |
14139 | 14132 |
main () |
14140 | 14133 |
{ |
14141 |
-return srunner_create (); |
|
14134 |
+srunner_create(0) |
|
14142 | 14135 |
; |
14143 | 14136 |
return 0; |
14144 | 14137 |
} |
... | ... |
@@ -14162,27 +14574,13 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
14162 | 14162 |
} && test -s conftest$ac_exeext && |
14163 | 14163 |
$as_test_x conftest$ac_exeext; then |
14164 | 14164 |
|
14165 |
- { echo "$as_me:$LINENO: result: ok" >&5 |
|
14166 |
-echo "${ECHO_T}ok" >&6; } |
|
14167 |
- |
|
14168 |
-cat >>confdefs.h <<\_ACEOF |
|
14169 |
-#define HAVE_CHECK 1 |
|
14170 |
-_ACEOF |
|
14171 |
- |
|
14172 |
- # Check whether --enable-tests-install was given. |
|
14173 |
-if test "${enable_tests_install+set}" = set; then |
|
14174 |
- enableval=$enable_tests_install; enable_ut_install=$enableval |
|
14175 |
-else |
|
14176 |
- enable_ut_install="no" |
|
14177 |
-fi |
|
14178 |
- |
|
14165 |
+ ac_cv_findlib_CHECK_libs="$LIBCHECK" |
|
14166 |
+ ac_cv_findlib_CHECK_inc="$INCCHECK" |
|
14179 | 14167 |
|
14180 | 14168 |
else |
14181 | 14169 |
echo "$as_me: failed program was:" >&5 |
14182 | 14170 |
sed 's/^/| /' conftest.$ac_ext >&5 |
14183 | 14171 |
|
14184 |
- { echo "$as_me:$LINENO: result: failed" >&5 |
|
14185 |
-echo "${ECHO_T}failed" >&6; };CHECK_LIBS= |
|
14186 | 14172 |
|
14187 | 14173 |
fi |
14188 | 14174 |
|
... | ... |
@@ -14191,27 +14589,53 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
14191 | 14191 |
|
14192 | 14192 |
fi |
14193 | 14193 |
|
14194 |
+ CPPFLAGS="$save_CPPFLAGS" |
|
14195 |
+ LIBS="$save_CPPFLAGS" |
|
14196 |
+ |
|
14197 |
+fi |
|
14198 |
+{ echo "$as_me:$LINENO: result: $ac_cv_findlib_CHECK_libs" >&5 |
|
14199 |
+echo "${ECHO_T}$ac_cv_findlib_CHECK_libs" >&6; } |
|
14200 |
+ if test "X$ac_cv_findlib_CHECK_libs" = "X"; then |
|
14201 |
+ |
|
14202 |
+ { echo "$as_me:$LINENO: unable to compile/link with check" >&5 |
|
14203 |
+echo "$as_me: unable to compile/link with check" >&6;} |
|
14204 |
+ HAVE_LIBCHECK=no |
|
14205 |
+ |
|
14206 |
+ |
|
14207 |
+else |
|
14208 |
+ |
|
14209 |
+ { echo "$as_me:$LINENO: Compiling and linking with check by using $ac_cv_findlib_CHECK_inc $ac_cv_findlib_CHECK_libs" >&5 |
|
14210 |
+echo "$as_me: Compiling and linking with check by using $ac_cv_findlib_CHECK_inc $ac_cv_findlib_CHECK_libs" >&6;} |
|
14211 |
+ |
|
14212 |
+cat >>confdefs.h <<\_ACEOF |
|
14213 |
+#define HAVE_LIBCHECK 1 |
|
14214 |
+_ACEOF |
|
14215 |
+ |
|
14216 |
+ HAVE_LIBCHECK=yes |
|
14217 |
+ CHECK_CPPFLAGS="$INCCHECK"; CHECK_LIBS="$LTLIBCHECK" |
|
14194 | 14218 |
|
14195 |
- LIBS="$save_LIBS" |
|
14196 |
- CPPFLAGS="$save_CPPFLAGS" |
|
14197 | 14219 |
fi |
14198 | 14220 |
|
14221 |
+ |
|
14222 |
+ |
|
14223 |
+fi |
|
14224 |
+ |
|
14225 |
+ |
|
14226 |
+ if test "X$HAVE_LIBCHECK" = "Xyes"; then |
|
14227 |
+ HAVE_LIBCHECK_TRUE= |
|
14228 |
+ HAVE_LIBCHECK_FALSE='#' |
|
14229 |
+else |
|
14230 |
+ HAVE_LIBCHECK_TRUE='#' |
|
14231 |
+ HAVE_LIBCHECK_FALSE= |
|
14232 |
+fi |
|
14233 |
+ |
|
14234 |
+ |
|
14199 | 14235 |
if test "x$CHECK_LIBS" = "x" -a "$enable_check_ut" = "yes"; then |
14200 | 14236 |
{ { echo "$as_me:$LINENO: error: |
14201 |
-$CHECK_PKG_ERRORS |
|
14202 |
- |
|
14203 |
-Alternatively, you may set the environment variables CHECK_CFLAGS |
|
14204 |
-and CHECK_LIBS to avoid the need to call pkg-config. |
|
14205 |
-See the pkg-config man page for more details. |
|
14206 | 14237 |
|
14207 | 14238 |
ERROR! Check was configured, but not found. Get it from http://check.sf.net/ |
14208 | 14239 |
" >&5 |
14209 | 14240 |
echo "$as_me: error: |
14210 |
-$CHECK_PKG_ERRORS |
|
14211 |
- |
|
14212 |
-Alternatively, you may set the environment variables CHECK_CFLAGS |
|
14213 |
-and CHECK_LIBS to avoid the need to call pkg-config. |
|
14214 |
-See the pkg-config man page for more details. |
|
14215 | 14241 |
|
14216 | 14242 |
ERROR! Check was configured, but not found. Get it from http://check.sf.net/ |
14217 | 14243 |
" >&2;} |
... | ... |
@@ -14379,14 +14803,6 @@ else |
14379 | 14379 |
ENABLE_COVERAGE_FALSE= |
14380 | 14380 |
fi |
14381 | 14381 |
|
14382 |
- if test "x$enable_ut_install" = "xyes"; then |
|
14383 |
- ENABLE_UT_INSTALL_TRUE= |
|
14384 |
- ENABLE_UT_INSTALL_FALSE='#' |
|
14385 |
-else |
|
14386 |
- ENABLE_UT_INSTALL_TRUE='#' |
|
14387 |
- ENABLE_UT_INSTALL_FALSE= |
|
14388 |
-fi |
|
14389 |
- |
|
14390 | 14382 |
|
14391 | 14383 |
have_pthreads=no |
14392 | 14384 |
if test "${ac_cv_header_pthread_h+set}" = set; then |
... | ... |
@@ -14925,190 +15341,6 @@ fi |
14925 | 14925 |
if test "$want_bzip2" = "yes" |
14926 | 14926 |
then |
14927 | 14927 |
|
14928 |
- if test "X$prefix" = "XNONE"; then |
|
14929 |
- acl_final_prefix="$ac_default_prefix" |
|
14930 |
- else |
|
14931 |
- acl_final_prefix="$prefix" |
|
14932 |
- fi |
|
14933 |
- if test "X$exec_prefix" = "XNONE"; then |
|
14934 |
- acl_final_exec_prefix='${prefix}' |
|
14935 |
- else |
|
14936 |
- acl_final_exec_prefix="$exec_prefix" |
|
14937 |
- fi |
|
14938 |
- acl_save_prefix="$prefix" |
|
14939 |
- prefix="$acl_final_prefix" |
|
14940 |
- eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" |
|
14941 |
- prefix="$acl_save_prefix" |
|
14942 |
- |
|
14943 |
- |
|
14944 |
-# Check whether --with-gnu-ld was given. |
|
14945 |
-if test "${with_gnu_ld+set}" = set; then |
|
14946 |
- withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes |
|
14947 |
-else |
|
14948 |
- with_gnu_ld=no |
|
14949 |
-fi |
|
14950 |
- |
|
14951 |
-# Prepare PATH_SEPARATOR. |
|
14952 |
-# The user is always right. |
|
14953 |
-if test "${PATH_SEPARATOR+set}" != set; then |
|
14954 |
- echo "#! /bin/sh" >conf$$.sh |
|
14955 |
- echo "exit 0" >>conf$$.sh |
|
14956 |
- chmod +x conf$$.sh |
|
14957 |
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then |
|
14958 |
- PATH_SEPARATOR=';' |
|
14959 |
- else |
|
14960 |
- PATH_SEPARATOR=: |
|
14961 |
- fi |
|
14962 |
- rm -f conf$$.sh |
|
14963 |
-fi |
|
14964 |
-ac_prog=ld |
|
14965 |
-if test "$GCC" = yes; then |
|
14966 |
- # Check if gcc -print-prog-name=ld gives a path. |
|
14967 |
- { echo "$as_me:$LINENO: checking for ld used by GCC" >&5 |
|
14968 |
-echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6; } |
|
14969 |
- case $host in |
|
14970 |
- *-*-mingw*) |
|
14971 |
- # gcc leaves a trailing carriage return which upsets mingw |
|
14972 |
- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; |
|
14973 |
- *) |
|
14974 |
- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; |
|
14975 |
- esac |
|
14976 |
- case $ac_prog in |
|
14977 |
- # Accept absolute paths. |
|
14978 |
- [\\/]* | [A-Za-z]:[\\/]*) |
|
14979 |
- re_direlt='/[^/][^/]*/\.\./' |
|
14980 |
- # Canonicalize the path of ld |
|
14981 |
- ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` |
|
14982 |
- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do |
|
14983 |
- ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` |
|
14984 |
- done |
|
14985 |
- test -z "$LD" && LD="$ac_prog" |
|
14986 |
- ;; |
|
14987 |
- "") |
|
14988 |
- # If it fails, then pretend we aren't using GCC. |
|
14989 |
- ac_prog=ld |
|
14990 |
- ;; |
|
14991 |
- *) |
|
14992 |
- # If it is relative, then search for the first ld in PATH. |
|
14993 |
- with_gnu_ld=unknown |
|
14994 |
- ;; |
|
14995 |
- esac |
|
14996 |
-elif test "$with_gnu_ld" = yes; then |
|
14997 |
- { echo "$as_me:$LINENO: checking for GNU ld" >&5 |
|
14998 |
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } |
|
14999 |
-else |
|
15000 |
- { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 |
|
15001 |
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } |
|
15002 |
-fi |
|
15003 |
-if test "${acl_cv_path_LD+set}" = set; then |
|
15004 |
- echo $ECHO_N "(cached) $ECHO_C" >&6 |
|
15005 |
-else |
|
15006 |
- if test -z "$LD"; then |
|
15007 |
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" |
|
15008 |
- for ac_dir in $PATH; do |
|
15009 |
- test -z "$ac_dir" && ac_dir=. |
|
15010 |
- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then |
|
15011 |
- acl_cv_path_LD="$ac_dir/$ac_prog" |
|
15012 |
- # Check to see if the program is GNU ld. I'd rather use --version, |
|
15013 |
- # but apparently some GNU ld's only accept -v. |
|
15014 |
- # Break only if it was the GNU/non-GNU ld that we prefer. |
|
15015 |
- case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in |
|
15016 |
- *GNU* | *'with BFD'*) |
|
15017 |
- test "$with_gnu_ld" != no && break ;; |
|
15018 |
- *) |
|
15019 |
- test "$with_gnu_ld" != yes && break ;; |
|
15020 |
- esac |
|
15021 |
- fi |
|
15022 |
- done |
|
15023 |
- IFS="$ac_save_ifs" |
|
15024 |
-else |
|
15025 |
- acl_cv_path_LD="$LD" # Let the user override the test with a path. |
|
15026 |
-fi |
|
15027 |
-fi |
|
15028 |
- |
|
15029 |
-LD="$acl_cv_path_LD" |
|
15030 |
-if test -n "$LD"; then |
|
15031 |
- { echo "$as_me:$LINENO: result: $LD" >&5 |
|
15032 |
-echo "${ECHO_T}$LD" >&6; } |
|
15033 |
-else |
|
15034 |
- { echo "$as_me:$LINENO: result: no" >&5 |
|
15035 |
-echo "${ECHO_T}no" >&6; } |
|
15036 |
-fi |
|
15037 |
-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 |
|
15038 |
-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} |
|
15039 |
- { (exit 1); exit 1; }; } |
|
15040 |
-{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 |
|
15041 |
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } |
|
15042 |
-if test "${acl_cv_prog_gnu_ld+set}" = set; then |
|
15043 |
- echo $ECHO_N "(cached) $ECHO_C" >&6 |
|
15044 |
-else |
|
15045 |
- # I'd rather use --version here, but apparently some GNU ld's only accept -v. |
|
15046 |
-case `$LD -v 2>&1 </dev/null` in |
|
15047 |
-*GNU* | *'with BFD'*) |
|
15048 |
- acl_cv_prog_gnu_ld=yes ;; |
|
15049 |
-*) |
|
15050 |
- acl_cv_prog_gnu_ld=no ;; |
|
15051 |
-esac |
|
15052 |
-fi |
|
15053 |
-{ echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5 |
|
15054 |
-echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6; } |
|
15055 |
-with_gnu_ld=$acl_cv_prog_gnu_ld |
|
15056 |
- |
|
15057 |
- |
|
15058 |
- |
|
15059 |
- |
|
15060 |
- { echo "$as_me:$LINENO: checking for shared library run path origin" >&5 |
|
15061 |
-echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6; } |
|
15062 |
-if test "${acl_cv_rpath+set}" = set; then |
|
15063 |
- echo $ECHO_N "(cached) $ECHO_C" >&6 |
|
15064 |
-else |
|
15065 |
- |
|
15066 |
- CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ |
|
15067 |
- ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh |
|
15068 |
- . ./conftest.sh |
|
15069 |
- rm -f ./conftest.sh |
|
15070 |
- acl_cv_rpath=done |
|
15071 |
- |
|
15072 |
-fi |
|
15073 |
-{ echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5 |
|
15074 |
-echo "${ECHO_T}$acl_cv_rpath" >&6; } |
|
15075 |
- wl="$acl_cv_wl" |
|
15076 |
- acl_libext="$acl_cv_libext" |
|
15077 |
- acl_shlibext="$acl_cv_shlibext" |
|
15078 |
- acl_libname_spec="$acl_cv_libname_spec" |
|
15079 |
- acl_library_names_spec="$acl_cv_library_names_spec" |
|
15080 |
- acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" |
|
15081 |
- acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" |
|
15082 |
- acl_hardcode_direct="$acl_cv_hardcode_direct" |
|
15083 |
- acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" |
|
15084 |
- # Check whether --enable-rpath was given. |
|
15085 |
-if test "${enable_rpath+set}" = set; then |
|
15086 |
- enableval=$enable_rpath; : |
|
15087 |
-else |
|
15088 |
- enable_rpath=yes |
|
15089 |
-fi |
|
15090 |
- |
|
15091 |
- |
|
15092 |
- |
|
15093 |
- acl_libdirstem=lib |
|
15094 |
- searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` |
|
15095 |
- if test -n "$searchpath"; then |
|
15096 |
- acl_save_IFS="${IFS= }"; IFS=":" |
|
15097 |
- for searchdir in $searchpath; do |
|
15098 |
- if test -d "$searchdir"; then |
|
15099 |
- case "$searchdir" in |
|
15100 |
- */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; |
|
15101 |
- *) searchdir=`cd "$searchdir" && pwd` |
|
15102 |
- case "$searchdir" in |
|
15103 |
- */lib64 ) acl_libdirstem=lib64 ;; |
|
15104 |
- esac ;; |
|
15105 |
- esac |
|
15106 |
- fi |
|
15107 |
- done |
|
15108 |
- IFS="$acl_save_IFS" |
|
15109 |
- fi |
|
15110 |
- |
|
15111 |
- |
|
15112 | 14928 |
|
15113 | 14929 |
|
15114 | 14930 |
|
... | ... |
@@ -15965,11 +16197,6 @@ else |
15965 | 15965 |
fi |
15966 | 15966 |
|
15967 | 15967 |
|
15968 |
- |
|
15969 |
-cat >>confdefs.h <<\_ACEOF |
|
15970 |
-#define HAVE_GETHOSTBYNAME_R_6 1 |
|
15971 |
-_ACEOF |
|
15972 |
- |
|
15973 | 15968 |
if test "$want_getaddrinfo" = "yes" |
15974 | 15969 |
then |
15975 | 15970 |
{ echo "$as_me:$LINENO: checking for getaddrinfo" >&5 |
... | ... |
@@ -20868,17 +21095,17 @@ echo "$as_me: error: conditional \"VERSIONSCRIPT\" was never defined. |
20868 | 20868 |
Usually this means the macro was only invoked conditionally." >&2;} |
20869 | 20869 |
{ (exit 1); exit 1; }; } |
20870 | 20870 |
fi |
20871 |
-if test -z "${ENABLE_COVERAGE_TRUE}" && test -z "${ENABLE_COVERAGE_FALSE}"; then |
|
20872 |
- { { echo "$as_me:$LINENO: error: conditional \"ENABLE_COVERAGE\" was never defined. |
|
20871 |
+if test -z "${HAVE_LIBCHECK_TRUE}" && test -z "${HAVE_LIBCHECK_FALSE}"; then |
|
20872 |
+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_LIBCHECK\" was never defined. |
|
20873 | 20873 |
Usually this means the macro was only invoked conditionally." >&5 |
20874 |
-echo "$as_me: error: conditional \"ENABLE_COVERAGE\" was never defined. |
|
20874 |
+echo "$as_me: error: conditional \"HAVE_LIBCHECK\" was never defined. |
|
20875 | 20875 |
Usually this means the macro was only invoked conditionally." >&2;} |
20876 | 20876 |
{ (exit 1); exit 1; }; } |
20877 | 20877 |
fi |
20878 |
-if test -z "${ENABLE_UT_INSTALL_TRUE}" && test -z "${ENABLE_UT_INSTALL_FALSE}"; then |
|
20879 |
- { { echo "$as_me:$LINENO: error: conditional \"ENABLE_UT_INSTALL\" was never defined. |
|
20878 |
+if test -z "${ENABLE_COVERAGE_TRUE}" && test -z "${ENABLE_COVERAGE_FALSE}"; then |
|
20879 |
+ { { echo "$as_me:$LINENO: error: conditional \"ENABLE_COVERAGE\" was never defined. |
|
20880 | 20880 |
Usually this means the macro was only invoked conditionally." >&5 |
20881 |
-echo "$as_me: error: conditional \"ENABLE_UT_INSTALL\" was never defined. |
|
20881 |
+echo "$as_me: error: conditional \"ENABLE_COVERAGE\" was never defined. |
|
20882 | 20882 |
Usually this means the macro was only invoked conditionally." >&2;} |
20883 | 20883 |
{ (exit 1); exit 1; }; } |
20884 | 20884 |
fi |
... | ... |
@@ -21878,16 +22105,15 @@ VERSIONSCRIPTFLAG!$VERSIONSCRIPTFLAG$ac_delim |
21878 | 21878 |
VERSIONSCRIPT_TRUE!$VERSIONSCRIPT_TRUE$ac_delim |
21879 | 21879 |
VERSIONSCRIPT_FALSE!$VERSIONSCRIPT_FALSE$ac_delim |
21880 | 21880 |
GPERF!$GPERF$ac_delim |
21881 |
-PKG_CONFIG!$PKG_CONFIG$ac_delim |
|
21882 |
-CHECK_CFLAGS!$CHECK_CFLAGS$ac_delim |
|
21881 |
+CHECK_CPPFLAGS!$CHECK_CPPFLAGS$ac_delim |
|
21883 | 21882 |
CHECK_LIBS!$CHECK_LIBS$ac_delim |
21883 |
+HAVE_LIBCHECK_TRUE!$HAVE_LIBCHECK_TRUE$ac_delim |
|
21884 |
+HAVE_LIBCHECK_FALSE!$HAVE_LIBCHECK_FALSE$ac_delim |
|
21884 | 21885 |
GCOV!$GCOV$ac_delim |
21885 | 21886 |
LCOV!$LCOV$ac_delim |
21886 | 21887 |
GENHTML!$GENHTML$ac_delim |
21887 | 21888 |
ENABLE_COVERAGE_TRUE!$ENABLE_COVERAGE_TRUE$ac_delim |
21888 | 21889 |
ENABLE_COVERAGE_FALSE!$ENABLE_COVERAGE_FALSE$ac_delim |
21889 |
-ENABLE_UT_INSTALL_TRUE!$ENABLE_UT_INSTALL_TRUE$ac_delim |
|
21890 |
-ENABLE_UT_INSTALL_FALSE!$ENABLE_UT_INSTALL_FALSE$ac_delim |
|
21891 | 21890 |
MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim |
21892 | 21891 |
MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim |
21893 | 21892 |
MAINT!$MAINT$ac_delim |
... | ... |
@@ -21920,7 +22146,7 @@ LIBOBJS!$LIBOBJS$ac_delim |
21920 | 21920 |
LTLIBOBJS!$LTLIBOBJS$ac_delim |
21921 | 21921 |
_ACEOF |
21922 | 21922 |
|
21923 |
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 55; then |
|
21923 |
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 54; then |
|
21924 | 21924 |
break |
21925 | 21925 |
elif $ac_last_try; then |
21926 | 21926 |
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 |
... | ... |
@@ -323,41 +323,17 @@ AC_ARG_ENABLE(check, |
323 | 323 |
[ --enable-check Enable 'check' unit tests (default=auto)], enable_check_ut=$enableval, enable_check_ut="auto" ) |
324 | 324 |
|
325 | 325 |
if test "$enable_check_ut" != "no" ; then |
326 |
- PKG_CHECK_MODULES([CHECK],[check],[], [AC_MSG_WARN([unable to find 'check' using pkg-config: |
|
327 |
-$CHECK_PKG_ERRORS |
|
328 |
-_PKG_TEXT])]) |
|
329 |
- save_CPPFLAGS="$CPPFLAGS"; |
|
330 |
- CPPFLAGS="$CPPFLAGS $CHECK_CFLAGS" |
|
331 |
- save_LIBS="$LIBS" |
|
332 |
- if test -z "$CHECK_LIBS"; then |
|
333 |
- # when pkg-config is not available, use defaults |
|
334 |
- CHECK_LIBS="-lcheck" |
|
335 |
- fi |
|
336 |
- LIBS="$LIBS $CHECK_LIBS" |
|
337 |
- AC_CHECK_HEADER(check.h, |
|
338 |
- [ |
|
339 |
- AC_MSG_CHECKING([linking with check]) |
|
340 |
- AC_LINK_IFELSE([AC_LANG_CALL([],[srunner_create])],[ |
|
341 |
- AC_MSG_RESULT([ok]) |
|
342 |
- AC_DEFINE([HAVE_CHECK], 1, [Enable 'check' unit tests]) |
|
343 |
- AC_ARG_ENABLE(tests-install, |
|
344 |
- AC_HELP_STRING([--enable-tests-install], |
|
345 |
- [install unit tests |
|
346 |
- @<:@default=no@:>@]), |
|
347 |
- [enable_ut_install=$enableval],[enable_ut_install="no"]) |
|
348 |
- ], |
|
349 |
- [AC_MSG_RESULT([failed]);CHECK_LIBS=] |
|
350 |
- ) |
|
351 |
- ]) |
|
352 |
- LIBS="$save_LIBS" |
|
353 |
- CPPFLAGS="$save_CPPFLAGS" |
|
326 |
+ AC_LIB_FIND([check],[check.h], |
|
327 |
+ AC_LANG_PROGRAM([#include <check.h>],[srunner_create(0)]), |
|
328 |
+ [CHECK_CPPFLAGS="$INCCHECK"; CHECK_LIBS="$LTLIBCHECK"], |
|
329 |
+ []) |
|
354 | 330 |
fi |
331 |
+AC_SUBST([CHECK_CPPFLAGS]) |
|
332 |
+AC_SUBST([CHECK_LIBS]) |
|
333 |
+AM_CONDITIONAL([HAVE_LIBCHECK],test "X$HAVE_LIBCHECK" = "Xyes") |
|
355 | 334 |
|
356 | 335 |
if test "x$CHECK_LIBS" = "x" -a "$enable_check_ut" = "yes"; then |
357 | 336 |
AC_MSG_ERROR([ |
358 |
-$CHECK_PKG_ERRORS |
|
359 |
- |
|
360 |
-_PKG_TEXT |
|
361 | 337 |
|
362 | 338 |
ERROR! Check was configured, but not found. Get it from http://check.sf.net/ |
363 | 339 |
]) |
... | ... |
@@ -385,7 +361,6 @@ if test "x$enable_coverage" = "xyes"; then |
385 | 385 |
fi |
386 | 386 |
|
387 | 387 |
AM_CONDITIONAL(ENABLE_COVERAGE, test "x$enable_coverage" = "xyes") |
388 |
-AM_CONDITIONAL(ENABLE_UT_INSTALL, test "x$enable_ut_install" = "xyes") |
|
389 | 388 |
|
390 | 389 |
have_pthreads=no |
391 | 390 |
AC_CHECK_HEADER([pthread.h],[have_pthreads=yes],) |
... | ... |
@@ -495,7 +470,6 @@ AC_ARG_ENABLE([getaddrinfo], |
495 | 495 |
[ --disable-getaddrinfo disable support for getaddrinfo], |
496 | 496 |
want_getaddrinfo=$enableval, want_getaddrinfo="yes") |
497 | 497 |
|
498 |
- AC_DEFINE([HAVE_GETHOSTBYNAME_R_6],1,[gethostbyname_r takes 6 arguments]) |
|
499 | 498 |
if test "$want_getaddrinfo" = "yes" |
500 | 499 |
then |
501 | 500 |
AC_MSG_CHECKING([for getaddrinfo]) |
... | ... |
@@ -80,7 +80,7 @@ CC = @CC@ |
80 | 80 |
CCDEPMODE = @CCDEPMODE@ |
81 | 81 |
CFGDIR = @CFGDIR@ |
82 | 82 |
CFLAGS = @CFLAGS@ |
83 |
-CHECK_CFLAGS = @CHECK_CFLAGS@ |
|
83 |
+CHECK_CPPFLAGS = @CHECK_CPPFLAGS@ |
|
84 | 84 |
CHECK_LIBS = @CHECK_LIBS@ |
85 | 85 |
CLAMAVGROUP = @CLAMAVGROUP@ |
86 | 86 |
CLAMAVUSER = @CLAMAVUSER@ |
... | ... |
@@ -145,7 +145,6 @@ PACKAGE_STRING = @PACKAGE_STRING@ |
145 | 145 |
PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
146 | 146 |
PACKAGE_VERSION = @PACKAGE_VERSION@ |
147 | 147 |
PATH_SEPARATOR = @PATH_SEPARATOR@ |
148 |
-PKG_CONFIG = @PKG_CONFIG@ |
|
149 | 148 |
RANLIB = @RANLIB@ |
150 | 149 |
SED = @SED@ |
151 | 150 |
SET_MAKE = @SET_MAKE@ |
... | ... |
@@ -86,7 +86,7 @@ CC = @CC@ |
86 | 86 |
CCDEPMODE = @CCDEPMODE@ |
87 | 87 |
CFGDIR = @CFGDIR@ |
88 | 88 |
CFLAGS = @CFLAGS@ |
89 |
-CHECK_CFLAGS = @CHECK_CFLAGS@ |
|
89 |
+CHECK_CPPFLAGS = @CHECK_CPPFLAGS@ |
|
90 | 90 |
CHECK_LIBS = @CHECK_LIBS@ |
91 | 91 |
CLAMAVGROUP = @CLAMAVGROUP@ |
92 | 92 |
CLAMAVUSER = @CLAMAVUSER@ |
... | ... |
@@ -151,7 +151,6 @@ PACKAGE_STRING = @PACKAGE_STRING@ |
151 | 151 |
PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
152 | 152 |
PACKAGE_VERSION = @PACKAGE_VERSION@ |
153 | 153 |
PATH_SEPARATOR = @PATH_SEPARATOR@ |
154 |
-PKG_CONFIG = @PKG_CONFIG@ |
|
155 | 154 |
RANLIB = @RANLIB@ |
156 | 155 |
SED = @SED@ |
157 | 156 |
SET_MAKE = @SET_MAKE@ |
... | ... |
@@ -79,7 +79,7 @@ CC = @CC@ |
79 | 79 |
CCDEPMODE = @CCDEPMODE@ |
80 | 80 |
CFGDIR = @CFGDIR@ |
81 | 81 |
CFLAGS = @CFLAGS@ |
82 |
-CHECK_CFLAGS = @CHECK_CFLAGS@ |
|
82 |
+CHECK_CPPFLAGS = @CHECK_CPPFLAGS@ |
|
83 | 83 |
CHECK_LIBS = @CHECK_LIBS@ |
84 | 84 |
CLAMAVGROUP = @CLAMAVGROUP@ |
85 | 85 |
CLAMAVUSER = @CLAMAVUSER@ |
... | ... |
@@ -144,7 +144,6 @@ PACKAGE_STRING = @PACKAGE_STRING@ |
144 | 144 |
PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
145 | 145 |
PACKAGE_VERSION = @PACKAGE_VERSION@ |
146 | 146 |
PATH_SEPARATOR = @PATH_SEPARATOR@ |
147 |
-PKG_CONFIG = @PKG_CONFIG@ |
|
148 | 147 |
RANLIB = @RANLIB@ |
149 | 148 |
SED = @SED@ |
150 | 149 |
SET_MAKE = @SET_MAKE@ |
... | ... |
@@ -107,7 +107,7 @@ CC = @CC@ |
107 | 107 |
CCDEPMODE = @CCDEPMODE@ |
108 | 108 |
CFGDIR = @CFGDIR@ |
109 | 109 |
CFLAGS = @CFLAGS@ |
110 |
-CHECK_CFLAGS = @CHECK_CFLAGS@ |
|
110 |
+CHECK_CPPFLAGS = @CHECK_CPPFLAGS@ |
|
111 | 111 |
CHECK_LIBS = @CHECK_LIBS@ |
112 | 112 |
CLAMAVGROUP = @CLAMAVGROUP@ |
113 | 113 |
CLAMAVUSER = @CLAMAVUSER@ |
... | ... |
@@ -172,7 +172,6 @@ PACKAGE_STRING = @PACKAGE_STRING@ |
172 | 172 |
PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
173 | 173 |
PACKAGE_VERSION = @PACKAGE_VERSION@ |
174 | 174 |
PATH_SEPARATOR = @PATH_SEPARATOR@ |
175 |
-PKG_CONFIG = @PKG_CONFIG@ |
|
176 | 175 |
RANLIB = @RANLIB@ |
177 | 176 |
SED = @SED@ |
178 | 177 |
SET_MAKE = @SET_MAKE@ |
... | ... |
@@ -151,7 +151,7 @@ CC = @CC@ |
151 | 151 |
CCDEPMODE = @CCDEPMODE@ |
152 | 152 |
CFGDIR = @CFGDIR@ |
153 | 153 |
CFLAGS = @CFLAGS@ |
154 |
-CHECK_CFLAGS = @CHECK_CFLAGS@ |
|
154 |
+CHECK_CPPFLAGS = @CHECK_CPPFLAGS@ |
|
155 | 155 |
CHECK_LIBS = @CHECK_LIBS@ |
156 | 156 |
CLAMAVGROUP = @CLAMAVGROUP@ |
157 | 157 |
CLAMAVUSER = @CLAMAVUSER@ |
... | ... |
@@ -216,7 +216,6 @@ PACKAGE_STRING = @PACKAGE_STRING@ |
216 | 216 |
PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
217 | 217 |
PACKAGE_VERSION = @PACKAGE_VERSION@ |
218 | 218 |
PATH_SEPARATOR = @PATH_SEPARATOR@ |
219 |
-PKG_CONFIG = @PKG_CONFIG@ |
|
220 | 219 |
RANLIB = @RANLIB@ |
221 | 220 |
SED = @SED@ |
222 | 221 |
SET_MAKE = @SET_MAKE@ |
... | ... |
@@ -99,7 +99,7 @@ CC = @CC@ |
99 | 99 |
CCDEPMODE = @CCDEPMODE@ |
100 | 100 |
CFGDIR = @CFGDIR@ |
101 | 101 |
CFLAGS = @CFLAGS@ |
102 |
-CHECK_CFLAGS = @CHECK_CFLAGS@ |
|
102 |
+CHECK_CPPFLAGS = @CHECK_CPPFLAGS@ |
|
103 | 103 |
CHECK_LIBS = @CHECK_LIBS@ |
104 | 104 |
CLAMAVGROUP = @CLAMAVGROUP@ |
105 | 105 |
CLAMAVUSER = @CLAMAVUSER@ |
... | ... |
@@ -164,7 +164,6 @@ PACKAGE_STRING = @PACKAGE_STRING@ |
164 | 164 |
PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
165 | 165 |
PACKAGE_VERSION = @PACKAGE_VERSION@ |
166 | 166 |
PATH_SEPARATOR = @PATH_SEPARATOR@ |
167 |
-PKG_CONFIG = @PKG_CONFIG@ |
|
168 | 167 |
RANLIB = @RANLIB@ |
169 | 168 |
SED = @SED@ |
170 | 169 |
SET_MAKE = @SET_MAKE@ |
... | ... |
@@ -103,7 +103,7 @@ CC = @CC@ |
103 | 103 |
CCDEPMODE = @CCDEPMODE@ |
104 | 104 |
CFGDIR = @CFGDIR@ |
105 | 105 |
CFLAGS = @CFLAGS@ |
106 |
-CHECK_CFLAGS = @CHECK_CFLAGS@ |
|
106 |
+CHECK_CPPFLAGS = @CHECK_CPPFLAGS@ |
|
107 | 107 |
CHECK_LIBS = @CHECK_LIBS@ |
108 | 108 |
CLAMAVGROUP = @CLAMAVGROUP@ |
109 | 109 |
CLAMAVUSER = @CLAMAVUSER@ |
... | ... |
@@ -168,7 +168,6 @@ PACKAGE_STRING = @PACKAGE_STRING@ |
168 | 168 |
PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
169 | 169 |
PACKAGE_VERSION = @PACKAGE_VERSION@ |
170 | 170 |
PATH_SEPARATOR = @PATH_SEPARATOR@ |
171 |
-PKG_CONFIG = @PKG_CONFIG@ |
|
172 | 171 |
RANLIB = @RANLIB@ |
173 | 172 |
SED = @SED@ |
174 | 173 |
SET_MAKE = @SET_MAKE@ |
... | ... |
@@ -98,7 +98,7 @@ CC = @CC@ |
98 | 98 |
CCDEPMODE = @CCDEPMODE@ |
99 | 99 |
CFGDIR = @CFGDIR@ |
100 | 100 |
CFLAGS = @CFLAGS@ |
101 |
-CHECK_CFLAGS = @CHECK_CFLAGS@ |
|
101 |
+CHECK_CPPFLAGS = @CHECK_CPPFLAGS@ |
|
102 | 102 |
CHECK_LIBS = @CHECK_LIBS@ |
103 | 103 |
CLAMAVGROUP = @CLAMAVGROUP@ |
104 | 104 |
CLAMAVUSER = @CLAMAVUSER@ |
... | ... |
@@ -163,7 +163,6 @@ PACKAGE_STRING = @PACKAGE_STRING@ |
163 | 163 |
PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
164 | 164 |
PACKAGE_VERSION = @PACKAGE_VERSION@ |
165 | 165 |
PATH_SEPARATOR = @PATH_SEPARATOR@ |
166 |
-PKG_CONFIG = @PKG_CONFIG@ |
|
167 | 166 |
RANLIB = @RANLIB@ |
168 | 167 |
SED = @SED@ |
169 | 168 |
SET_MAKE = @SET_MAKE@ |
... | ... |
@@ -688,3 +688,51 @@ LIBS="$save_LIBS" |
688 | 688 |
]) |
689 | 689 |
]) |
690 | 690 |
|
691 |
+dnl AC_LIB_FIND(LIBNAME, HEADER, LINKTESTCODE, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND) |
|
692 |
+dnl Checks for flags needed to link with LIBNAME, for the existence of HEADER, |
|
693 |
+dnl and the ability to link with LINKTESTCODE. |
|
694 |
+dnl If successful sets LIB${LIBNAME}, LTLIB${LIBNAME}, INC${LIBNAME} variables, |
|
695 |
+dnl AC_DEFINEs HAVE_LIB${LIBNAME} to 1, defines HAVE_LIB${LIBNAME} to yes, |
|
696 |
+dnl and evaluates ACTION-IF-FOUND. |
|
697 |
+dnl Otherwise evaluates ACTION-IF-NOT-FOUND. |
|
698 |
+dnl -------------------------------------------------------------------------------- |
|
699 |
+AC_DEFUN([AC_LIB_FIND], |
|
700 |
+[ |
|
701 |
+ dnl Prerequisites of AC_LIB_LINKFLAGS_BODY |
|
702 |
+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) |
|
703 |
+ AC_REQUIRE([AC_LIB_RPATH]) |
|
704 |
+ m4_if($#,5,,[m4_fatal([$0: invalid number of arguments: $#])]) |
|
705 |
+ define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], |
|
706 |
+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) |
|
707 |
+ AC_CACHE_CHECK([how to compile and link with $1],[ac_cv_findlib_[]NAME[]_libs],[ |
|
708 |
+ save_CPPFLAGS="$CPPFLAGS" |
|
709 |
+ save_LIBS="$LIBS" |
|
710 |
+ AC_LIB_LINKFLAGS_BODY([$1]) |
|
711 |
+ CPPFLAGS="$CPPFLAGS $INC[]NAME" |
|
712 |
+ AC_CHECK_HEADER([$2], [have_header=yes],[have_header=no]) |
|
713 |
+ ac_cv_findlib_[]NAME[]_libs= |
|
714 |
+ ac_cv_findlib_[]NAME[]_inc= |
|
715 |
+ AS_IF([test "$have_header" = "yes"],[ |
|
716 |
+ LIBS="$LIBS $LIB[]NAME" |
|
717 |
+ AC_MSG_CHECKING([linking with $1]) |
|
718 |
+ AC_LINK_IFELSE([$3],[ |
|
719 |
+ ac_cv_findlib_[]NAME[]_libs="$LIB[]NAME" |
|
720 |
+ ac_cv_findlib_[]NAME[]_inc="$INC[]NAME" |
|
721 |
+ ]) |
|
722 |
+ ]) |
|
723 |
+ CPPFLAGS="$save_CPPFLAGS" |
|
724 |
+ LIBS="$save_CPPFLAGS" |
|
725 |
+ ]) |
|
726 |
+ AS_IF([test "X$ac_cv_findlib_[]NAME[]_libs" = "X"],[ |
|
727 |
+ AC_MSG_NOTICE([unable to compile/link with $1]) |
|
728 |
+ HAVE_LIB[]NAME=no |
|
729 |
+ $5 |
|
730 |
+ ],[ |
|
731 |
+ AC_MSG_NOTICE([Compiling and linking with $1 by using $ac_cv_findlib_[]NAME[]_inc $ac_cv_findlib_[]NAME[]_libs]) |
|
732 |
+ AC_DEFINE([HAVE_LIB]NAME,1,[Define to '1' if you have the $2 library]) |
|
733 |
+ HAVE_LIB[]NAME=yes |
|
734 |
+ $4 |
|
735 |
+ ]) |
|
736 |
+ undefine([NAME]) |
|
737 |
+]) |
|
738 |
+ |
... | ... |
@@ -104,7 +104,7 @@ CC = @CC@ |
104 | 104 |
CCDEPMODE = @CCDEPMODE@ |
105 | 105 |
CFGDIR = @CFGDIR@ |
106 | 106 |
CFLAGS = @CFLAGS@ |
107 |
-CHECK_CFLAGS = @CHECK_CFLAGS@ |
|
107 |
+CHECK_CPPFLAGS = @CHECK_CPPFLAGS@ |
|
108 | 108 |
CHECK_LIBS = @CHECK_LIBS@ |
109 | 109 |
CLAMAVGROUP = @CLAMAVGROUP@ |
110 | 110 |
CLAMAVUSER = @CLAMAVUSER@ |
... | ... |
@@ -171,7 +171,6 @@ PACKAGE_STRING = @PACKAGE_STRING@ |
171 | 171 |
PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
172 | 172 |
PACKAGE_VERSION = @PACKAGE_VERSION@ |
173 | 173 |
PATH_SEPARATOR = @PATH_SEPARATOR@ |
174 |
-PKG_CONFIG = @PKG_CONFIG@ |
|
175 | 174 |
RANLIB = @RANLIB@ |
176 | 175 |
SED = @SED@ |
177 | 176 |
SET_MAKE = @SET_MAKE@ |
... | ... |
@@ -61,7 +61,7 @@ CC = @CC@ |
61 | 61 |
CCDEPMODE = @CCDEPMODE@ |
62 | 62 |
CFGDIR = @CFGDIR@ |
63 | 63 |
CFLAGS = @CFLAGS@ |
64 |
-CHECK_CFLAGS = @CHECK_CFLAGS@ |
|
64 |
+CHECK_CPPFLAGS = @CHECK_CPPFLAGS@ |
|
65 | 65 |
CHECK_LIBS = @CHECK_LIBS@ |
66 | 66 |
CLAMAVGROUP = @CLAMAVGROUP@ |
67 | 67 |
CLAMAVUSER = @CLAMAVUSER@ |
... | ... |
@@ -126,7 +126,6 @@ PACKAGE_STRING = @PACKAGE_STRING@ |
126 | 126 |
PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
127 | 127 |
PACKAGE_VERSION = @PACKAGE_VERSION@ |
128 | 128 |
PATH_SEPARATOR = @PATH_SEPARATOR@ |
129 |
-PKG_CONFIG = @PKG_CONFIG@ |
|
130 | 129 |
RANLIB = @RANLIB@ |
131 | 130 |
SED = @SED@ |
132 | 131 |
SET_MAKE = @SET_MAKE@ |
... | ... |
@@ -9,16 +9,16 @@ $(FILES) : |
9 | 9 |
programs = check_clamav |
10 | 10 |
scripts = check_clamd.sh check_freshclam.sh check_sigtool.sh check_clamscan.sh valgrind_tests.sh |
11 | 11 |
TESTS = $(programs) $(scripts) |
12 |
-if ENABLE_UT_INSTALL |
|
13 |
-bin_PROGRAMS = $(programs) |
|
14 |
-dist_bin_SCRIPTS = $(scripts) |
|
15 |
-else |
|
16 | 12 |
check_PROGRAMS = $(programs) |
17 | 13 |
check_SCRIPTS = $(scripts) |
18 |
-endif |
|
14 |
+ |
|
15 |
+if HAVE_LIBCHECK |
|
19 | 16 |
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 |
20 |
-check_clamav_CFLAGS = @CHECK_CFLAGS@ -DSRCDIR=\"$(abs_srcdir)\" |
|
17 |
+check_clamav_CPPFLAGS = @CHECK_CPPFLAGS@ -DSRCDIR=\"$(abs_srcdir)\" |
|
21 | 18 |
check_clamav_LDADD = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@ @CHECK_LIBS@ |
19 |
+else |
|
20 |
+check_clamav_SOURCES = check_clamav_skip.c |
|
21 |
+endif |
|
22 | 22 |
|
23 | 23 |
check_clamd.sh: $(top_builddir)/test/clam.exe |
24 | 24 |
check_clamscan.sh: $(top_builddir)/test/clam.exe |
... | ... |
@@ -27,7 +27,7 @@ $(top_builddir)/test/clam.exe: |
27 | 27 |
(cd $(top_builddir)/test && $(MAKE)) |
28 | 28 |
|
29 | 29 |
CLEANFILES=lcov.out *.gcno *.gcda *.log clamd-test.socket /tmp/clamd-test.log $(FILES) test-stderr.log clamscan.log valgrind.log clamdscan.log |
30 |
-EXTRA_DIST=.split input test-clamd.conf test-freshclam.conf valgrind.supp virusaction-test.sh |
|
30 |
+EXTRA_DIST=.split input test-clamd.conf test-freshclam.conf valgrind.supp virusaction-test.sh $(scripts) |
|
31 | 31 |
if ENABLE_COVERAGE |
32 | 32 |
LCOV_OUTPUT = lcov.out |
33 | 33 |
LCOV_HTML = lcov_html |
... | ... |
@@ -13,8 +13,6 @@ |
13 | 13 |
# PARTICULAR PURPOSE. |
14 | 14 |
|
15 | 15 |
@SET_MAKE@ |
16 |
- |
|
17 |
- |
|
18 | 16 |
VPATH = @srcdir@ |
19 | 17 |
pkgdatadir = $(datadir)/@PACKAGE@ |
20 | 18 |
pkglibdir = $(libdir)/@PACKAGE@ |
... | ... |
@@ -35,11 +33,9 @@ build_triplet = @build@ |
35 | 35 |
host_triplet = @host@ |
36 | 36 |
target_triplet = @target@ |
37 | 37 |
TESTS = $(am__EXEEXT_1) $(scripts) |
38 |
-@ENABLE_UT_INSTALL_TRUE@bin_PROGRAMS = $(am__EXEEXT_1) |
|
39 |
-@ENABLE_UT_INSTALL_FALSE@check_PROGRAMS = $(am__EXEEXT_1) |
|
38 |
+check_PROGRAMS = $(am__EXEEXT_1) |
|
40 | 39 |
subdir = unit_tests |
41 |
-DIST_COMMON = $(am__dist_bin_SCRIPTS_DIST) $(srcdir)/Makefile.am \ |
|
42 |
- $(srcdir)/Makefile.in |
|
40 |
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in |
|
43 | 41 |
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
44 | 42 |
am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
45 | 43 |
$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-link.m4 \ |
... | ... |
@@ -54,25 +50,23 @@ mkinstalldirs = $(install_sh) -d |
54 | 54 |
CONFIG_HEADER = $(top_builddir)/clamav-config.h |
55 | 55 |
CONFIG_CLEAN_FILES = |
56 | 56 |
am__EXEEXT_1 = check_clamav$(EXEEXT) |
57 |
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" |
|
58 |
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) |
|
59 |
-PROGRAMS = $(bin_PROGRAMS) |
|
60 |
-am_check_clamav_OBJECTS = check_clamav-check_clamav.$(OBJEXT) \ |
|
61 |
- check_clamav-check_jsnorm.$(OBJEXT) \ |
|
62 |
- check_clamav-check_str.$(OBJEXT) \ |
|
63 |
- check_clamav-check_regex.$(OBJEXT) \ |
|
64 |
- check_clamav-check_disasm.$(OBJEXT) \ |
|
65 |
- check_clamav-check_uniq.$(OBJEXT) \ |
|
66 |
- check_clamav-check_matchers.$(OBJEXT) |
|
57 |
+am__check_clamav_SOURCES_DIST = check_clamav_skip.c check_clamav.c \ |
|
58 |
+ check_jsnorm.c check_str.c check_regex.c checks.h \ |
|
59 |
+ $(top_builddir)/libclamav/clamav.h check_disasm.c check_uniq.c \ |
|
60 |
+ check_matchers.c |
|
61 |
+@HAVE_LIBCHECK_FALSE@am_check_clamav_OBJECTS = \ |
|
62 |
+@HAVE_LIBCHECK_FALSE@ check_clamav-check_clamav_skip.$(OBJEXT) |
|
63 |
+@HAVE_LIBCHECK_TRUE@am_check_clamav_OBJECTS = \ |
|
64 |
+@HAVE_LIBCHECK_TRUE@ check_clamav-check_clamav.$(OBJEXT) \ |
|
65 |
+@HAVE_LIBCHECK_TRUE@ check_clamav-check_jsnorm.$(OBJEXT) \ |
|
66 |
+@HAVE_LIBCHECK_TRUE@ check_clamav-check_str.$(OBJEXT) \ |
|
67 |
+@HAVE_LIBCHECK_TRUE@ check_clamav-check_regex.$(OBJEXT) \ |
|
68 |
+@HAVE_LIBCHECK_TRUE@ check_clamav-check_disasm.$(OBJEXT) \ |
|
69 |
+@HAVE_LIBCHECK_TRUE@ check_clamav-check_uniq.$(OBJEXT) \ |
|
70 |
+@HAVE_LIBCHECK_TRUE@ check_clamav-check_matchers.$(OBJEXT) |
|
67 | 71 |
check_clamav_OBJECTS = $(am_check_clamav_OBJECTS) |
68 |
-check_clamav_DEPENDENCIES = $(top_builddir)/libclamav/libclamav.la |
|
69 |
-check_clamav_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ |
|
70 |
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(check_clamav_CFLAGS) \ |
|
71 |
- $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ |
|
72 |
-am__dist_bin_SCRIPTS_DIST = check_clamd.sh check_freshclam.sh \ |
|
73 |
- check_sigtool.sh check_clamscan.sh valgrind_tests.sh |
|
74 |
-dist_binSCRIPT_INSTALL = $(INSTALL_SCRIPT) |
|
75 |
-SCRIPTS = $(dist_bin_SCRIPTS) |
|
72 |
+@HAVE_LIBCHECK_TRUE@check_clamav_DEPENDENCIES = \ |
|
73 |
+@HAVE_LIBCHECK_TRUE@ $(top_builddir)/libclamav/libclamav.la |
|
76 | 74 |
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) |
77 | 75 |
depcomp = $(SHELL) $(top_srcdir)/config/depcomp |
78 | 76 |
am__depfiles_maybe = depfiles |
... | ... |
@@ -86,7 +80,7 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ |
86 | 86 |
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ |
87 | 87 |
$(LDFLAGS) -o $@ |
88 | 88 |
SOURCES = $(check_clamav_SOURCES) |
89 |
-DIST_SOURCES = $(check_clamav_SOURCES) |
|
89 |
+DIST_SOURCES = $(am__check_clamav_SOURCES_DIST) |
|
90 | 90 |
ETAGS = etags |
91 | 91 |
CTAGS = ctags |
92 | 92 |
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
... | ... |
@@ -101,7 +95,7 @@ CC = @CC@ |
101 | 101 |
CCDEPMODE = @CCDEPMODE@ |
102 | 102 |
CFGDIR = @CFGDIR@ |
103 | 103 |
CFLAGS = @CFLAGS@ |
104 |
-CHECK_CFLAGS = @CHECK_CFLAGS@ |
|
104 |
+CHECK_CPPFLAGS = @CHECK_CPPFLAGS@ |
|
105 | 105 |
CHECK_LIBS = @CHECK_LIBS@ |
106 | 106 |
CLAMAVGROUP = @CLAMAVGROUP@ |
107 | 107 |
CLAMAVUSER = @CLAMAVUSER@ |
... | ... |
@@ -166,7 +160,6 @@ PACKAGE_STRING = @PACKAGE_STRING@ |
166 | 166 |
PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
167 | 167 |
PACKAGE_VERSION = @PACKAGE_VERSION@ |
168 | 168 |
PATH_SEPARATOR = @PATH_SEPARATOR@ |
169 |
-PKG_CONFIG = @PKG_CONFIG@ |
|
170 | 169 |
RANLIB = @RANLIB@ |
171 | 170 |
SED = @SED@ |
172 | 171 |
SET_MAKE = @SET_MAKE@ |
... | ... |
@@ -236,13 +229,13 @@ SPLIT_DIR = $(top_srcdir)/unit_tests/.split |
236 | 236 |
FILES = clam-phish-exe |
237 | 237 |
programs = check_clamav |
238 | 238 |
scripts = check_clamd.sh check_freshclam.sh check_sigtool.sh check_clamscan.sh valgrind_tests.sh |
239 |
-@ENABLE_UT_INSTALL_TRUE@dist_bin_SCRIPTS = $(scripts) |
|
240 |
-@ENABLE_UT_INSTALL_FALSE@check_SCRIPTS = $(scripts) |
|
241 |
-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 |
|
242 |
-check_clamav_CFLAGS = @CHECK_CFLAGS@ -DSRCDIR=\"$(abs_srcdir)\" |
|
243 |
-check_clamav_LDADD = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@ @CHECK_LIBS@ |
|
239 |
+check_SCRIPTS = $(scripts) |
|
240 |
+@HAVE_LIBCHECK_FALSE@check_clamav_SOURCES = check_clamav_skip.c |
|
241 |
+@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 |
|
242 |
+@HAVE_LIBCHECK_TRUE@check_clamav_CPPFLAGS = @CHECK_CPPFLAGS@ -DSRCDIR=\"$(abs_srcdir)\" |
|
243 |
+@HAVE_LIBCHECK_TRUE@check_clamav_LDADD = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@ @CHECK_LIBS@ |
|
244 | 244 |
CLEANFILES = lcov.out *.gcno *.gcda *.log clamd-test.socket /tmp/clamd-test.log $(FILES) test-stderr.log clamscan.log valgrind.log clamdscan.log |
245 |
-EXTRA_DIST = .split input test-clamd.conf test-freshclam.conf valgrind.supp virusaction-test.sh |
|
245 |
+EXTRA_DIST = .split input test-clamd.conf test-freshclam.conf valgrind.supp virusaction-test.sh $(scripts) |
|
246 | 246 |
@ENABLE_COVERAGE_TRUE@LCOV_OUTPUT = lcov.out |
247 | 247 |
@ENABLE_COVERAGE_TRUE@LCOV_HTML = lcov_html |
248 | 248 |
@ENABLE_COVERAGE_TRUE@LCOV_LCOV = @LCOV@ |
... | ... |
@@ -282,50 +275,6 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) |
282 | 282 |
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
283 | 283 |
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) |
284 | 284 |
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
285 |
-install-binPROGRAMS: $(bin_PROGRAMS) |
|
286 |
- @$(NORMAL_INSTALL) |
|
287 |
- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" |
|
288 |
- @list='$(bin_PROGRAMS)'; for p in $$list; do \ |
|
289 |
- p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ |
|
290 |
- if test -f $$p \ |
|
291 |
- || test -f $$p1 \ |
|
292 |
- ; then \ |
|
293 |
- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ |
|
294 |
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ |
|
295 |
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ |
|
296 |
- else :; fi; \ |
|
297 |
- done |
|
298 |
- |
|
299 |
-uninstall-binPROGRAMS: |
|
300 |
- @$(NORMAL_UNINSTALL) |
|
301 |
- @list='$(bin_PROGRAMS)'; for p in $$list; do \ |
|
302 |
- f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ |
|
303 |
- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ |
|
304 |
- rm -f "$(DESTDIR)$(bindir)/$$f"; \ |
|
305 |
- done |
|
306 |
- |
|
307 |
-clean-binPROGRAMS: |
|
308 |
- @list='$(bin_PROGRAMS)'; for p in $$list; do \ |
|
309 |
- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ |
|
310 |
- echo " rm -f $$p $$f"; \ |
|
311 |
- rm -f $$p $$f ; \ |
|
312 |
- done |
|
313 |
- |
|
314 |
-installcheck-binPROGRAMS: $(bin_PROGRAMS) |
|
315 |
- bad=0; pid=$$$$; list="$(bin_PROGRAMS)"; for p in $$list; do \ |
|
316 |
- case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \ |
|
317 |
- *" $$p "* | *" $(srcdir)/$$p "*) continue;; \ |
|
318 |
- esac; \ |
|
319 |
- f=`echo "$$p" | \ |
|
320 |
- sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ |
|
321 |
- for opt in --help --version; do \ |
|
322 |
- if "$(DESTDIR)$(bindir)/$$f" $$opt >c$${pid}_.out \ |
|
323 |
- 2>c$${pid}_.err </dev/null \ |
|
324 |
- && test -n "`cat c$${pid}_.out`" \ |
|
325 |
- && test -z "`cat c$${pid}_.err`"; then :; \ |
|
326 |
- else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \ |
|
327 |
- done; \ |
|
328 |
- done; rm -f c$${pid}_.???; exit $$bad |
|
329 | 285 |
|
330 | 286 |
clean-checkPROGRAMS: |
331 | 287 |
@list='$(check_PROGRAMS)'; for p in $$list; do \ |
... | ... |
@@ -335,41 +284,7 @@ clean-checkPROGRAMS: |
335 | 335 |
done |
336 | 336 |
check_clamav$(EXEEXT): $(check_clamav_OBJECTS) $(check_clamav_DEPENDENCIES) |
337 | 337 |
@rm -f check_clamav$(EXEEXT) |
338 |
- $(check_clamav_LINK) $(check_clamav_OBJECTS) $(check_clamav_LDADD) $(LIBS) |
|
339 |
-install-dist_binSCRIPTS: $(dist_bin_SCRIPTS) |
|
340 |
- @$(NORMAL_INSTALL) |
|
341 |
- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" |
|
342 |
- @list='$(dist_bin_SCRIPTS)'; for p in $$list; do \ |
|
343 |
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
|
344 |
- if test -f $$d$$p; then \ |
|
345 |
- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ |
|
346 |
- echo " $(dist_binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ |
|
347 |
- $(dist_binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ |
|
348 |
- else :; fi; \ |
|
349 |
- done |
|
350 |
- |
|
351 |
-uninstall-dist_binSCRIPTS: |
|
352 |
- @$(NORMAL_UNINSTALL) |
|
353 |
- @list='$(dist_bin_SCRIPTS)'; for p in $$list; do \ |
|
354 |
- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ |
|
355 |
- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ |
|
356 |
- rm -f "$(DESTDIR)$(bindir)/$$f"; \ |
|
357 |
- done |
|
358 |
- |
|
359 |
-installcheck-dist_binSCRIPTS: $(dist_bin_SCRIPTS) |
|
360 |
- bad=0; pid=$$$$; list="$(dist_bin_SCRIPTS)"; for p in $$list; do \ |
|
361 |
- case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \ |
|
362 |
- *" $$p "* | *" $(srcdir)/$$p "*) continue;; \ |
|
363 |
- esac; \ |
|
364 |
- f=`echo "$$p" | sed 's,^.*/,,;$(transform)'`; \ |
|
365 |
- for opt in --help --version; do \ |
|
366 |
- if "$(DESTDIR)$(bindir)/$$f" $$opt >c$${pid}_.out \ |
|
367 |
- 2>c$${pid}_.err </dev/null \ |
|
368 |
- && test -n "`cat c$${pid}_.out`" \ |
|
369 |
- && test -z "`cat c$${pid}_.err`"; then :; \ |
|
370 |
- else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \ |
|
371 |
- done; \ |
|
372 |
- done; rm -f c$${pid}_.???; exit $$bad |
|
338 |
+ $(LINK) $(check_clamav_OBJECTS) $(check_clamav_LDADD) $(LIBS) |
|
373 | 339 |
|
374 | 340 |
mostlyclean-compile: |
375 | 341 |
-rm -f *.$(OBJEXT) |
... | ... |
@@ -378,6 +293,7 @@ distclean-compile: |
378 | 378 |
-rm -f *.tab.c |
379 | 379 |
|
380 | 380 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_clamav-check_clamav.Po@am__quote@ |
381 |
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_clamav-check_clamav_skip.Po@am__quote@ |
|
381 | 382 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_clamav-check_disasm.Po@am__quote@ |
382 | 383 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_clamav-check_jsnorm.Po@am__quote@ |
383 | 384 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_clamav-check_matchers.Po@am__quote@ |
... | ... |
@@ -406,103 +322,117 @@ distclean-compile: |
406 | 406 |
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
407 | 407 |
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< |
408 | 408 |
|
409 |
+check_clamav-check_clamav_skip.o: check_clamav_skip.c |
|
410 |
+@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 |
|
411 |
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_clamav-check_clamav_skip.Tpo $(DEPDIR)/check_clamav-check_clamav_skip.Po |
|
412 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check_clamav_skip.c' object='check_clamav-check_clamav_skip.o' libtool=no @AMDEPBACKSLASH@ |
|
413 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
|
414 |
+@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 |
|
415 |
+ |
|
416 |
+check_clamav-check_clamav_skip.obj: check_clamav_skip.c |
|
417 |
+@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` |
|
418 |
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_clamav-check_clamav_skip.Tpo $(DEPDIR)/check_clamav-check_clamav_skip.Po |
|
419 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check_clamav_skip.c' object='check_clamav-check_clamav_skip.obj' libtool=no @AMDEPBACKSLASH@ |
|
420 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
|
421 |
+@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` |
|
422 |
+ |
|
409 | 423 |
check_clamav-check_clamav.o: check_clamav.c |
410 |
-@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 |
|
424 |
+@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 |
|
411 | 425 |
@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_clamav-check_clamav.Tpo $(DEPDIR)/check_clamav-check_clamav.Po |
412 | 426 |
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check_clamav.c' object='check_clamav-check_clamav.o' libtool=no @AMDEPBACKSLASH@ |
413 | 427 |
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
414 |
-@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 |
|
428 |
+@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 |
|
415 | 429 |
|
416 | 430 |
check_clamav-check_clamav.obj: check_clamav.c |
417 |
-@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` |
|
431 |
+@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` |
|
418 | 432 |
@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_clamav-check_clamav.Tpo $(DEPDIR)/check_clamav-check_clamav.Po |
419 | 433 |
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check_clamav.c' object='check_clamav-check_clamav.obj' libtool=no @AMDEPBACKSLASH@ |
420 | 434 |
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
421 |
-@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` |
|
435 |
+@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` |
|
422 | 436 |
|
423 | 437 |
check_clamav-check_jsnorm.o: check_jsnorm.c |
424 |
-@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 |
|
438 |
+@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 |
|
425 | 439 |
@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_clamav-check_jsnorm.Tpo $(DEPDIR)/check_clamav-check_jsnorm.Po |
426 | 440 |
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check_jsnorm.c' object='check_clamav-check_jsnorm.o' libtool=no @AMDEPBACKSLASH@ |
427 | 441 |
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
428 |
-@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 |
|
442 |
+@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 |
|
429 | 443 |
|
430 | 444 |
check_clamav-check_jsnorm.obj: check_jsnorm.c |
431 |
-@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` |
|
445 |
+@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` |
|
432 | 446 |
@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_clamav-check_jsnorm.Tpo $(DEPDIR)/check_clamav-check_jsnorm.Po |
433 | 447 |
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check_jsnorm.c' object='check_clamav-check_jsnorm.obj' libtool=no @AMDEPBACKSLASH@ |
434 | 448 |
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
435 |
-@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` |
|
449 |
+@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` |
|
436 | 450 |
|
437 | 451 |
check_clamav-check_str.o: check_str.c |
438 |
-@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 |
|
452 |
+@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 |
|
439 | 453 |
@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_clamav-check_str.Tpo $(DEPDIR)/check_clamav-check_str.Po |
440 | 454 |
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check_str.c' object='check_clamav-check_str.o' libtool=no @AMDEPBACKSLASH@ |
441 | 455 |
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
442 |
-@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 |
|
456 |
+@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 |
|
443 | 457 |
|
444 | 458 |
check_clamav-check_str.obj: check_str.c |
445 |
-@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` |
|
459 |
+@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` |
|
446 | 460 |
@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_clamav-check_str.Tpo $(DEPDIR)/check_clamav-check_str.Po |
447 | 461 |
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check_str.c' object='check_clamav-check_str.obj' libtool=no @AMDEPBACKSLASH@ |
448 | 462 |
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
449 |
-@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` |
|
463 |
+@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` |
|
450 | 464 |
|
451 | 465 |
check_clamav-check_regex.o: check_regex.c |
452 |
-@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 |
|
466 |
+@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 |
|
453 | 467 |
@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_clamav-check_regex.Tpo $(DEPDIR)/check_clamav-check_regex.Po |
454 | 468 |
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check_regex.c' object='check_clamav-check_regex.o' libtool=no @AMDEPBACKSLASH@ |
455 | 469 |
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
456 |
-@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 |
|
470 |
+@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 |
|
457 | 471 |
|
458 | 472 |
check_clamav-check_regex.obj: check_regex.c |
459 |
-@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` |
|
473 |
+@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` |
|
460 | 474 |
@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_clamav-check_regex.Tpo $(DEPDIR)/check_clamav-check_regex.Po |
461 | 475 |
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check_regex.c' object='check_clamav-check_regex.obj' libtool=no @AMDEPBACKSLASH@ |
462 | 476 |
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
463 |
-@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` |
|
477 |
+@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` |
|
464 | 478 |
|
465 | 479 |
check_clamav-check_disasm.o: check_disasm.c |
466 |
-@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 |
|
480 |
+@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 |
|
467 | 481 |
@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_clamav-check_disasm.Tpo $(DEPDIR)/check_clamav-check_disasm.Po |
468 | 482 |
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check_disasm.c' object='check_clamav-check_disasm.o' libtool=no @AMDEPBACKSLASH@ |
469 | 483 |
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
470 |
-@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 |
|
484 |
+@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 |
|
471 | 485 |
|
472 | 486 |
check_clamav-check_disasm.obj: check_disasm.c |
473 |
-@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` |
|
487 |
+@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` |
|
474 | 488 |
@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_clamav-check_disasm.Tpo $(DEPDIR)/check_clamav-check_disasm.Po |
475 | 489 |
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check_disasm.c' object='check_clamav-check_disasm.obj' libtool=no @AMDEPBACKSLASH@ |
476 | 490 |
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
477 |
-@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` |
|
491 |
+@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` |
|
478 | 492 |
|
479 | 493 |
check_clamav-check_uniq.o: check_uniq.c |
480 |
-@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 |
|
494 |
+@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 |
|
481 | 495 |
@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_clamav-check_uniq.Tpo $(DEPDIR)/check_clamav-check_uniq.Po |
482 | 496 |
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check_uniq.c' object='check_clamav-check_uniq.o' libtool=no @AMDEPBACKSLASH@ |
483 | 497 |
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
484 |
-@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 |
|
498 |
+@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 |
|
485 | 499 |
|
486 | 500 |
check_clamav-check_uniq.obj: check_uniq.c |
487 |
-@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` |
|
501 |
+@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` |
|
488 | 502 |
@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_clamav-check_uniq.Tpo $(DEPDIR)/check_clamav-check_uniq.Po |
489 | 503 |
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check_uniq.c' object='check_clamav-check_uniq.obj' libtool=no @AMDEPBACKSLASH@ |
490 | 504 |
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
491 |
-@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` |
|
505 |
+@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` |
|
492 | 506 |
|
493 | 507 |
check_clamav-check_matchers.o: check_matchers.c |
494 |
-@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 |
|
508 |
+@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 |
|
495 | 509 |
@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_clamav-check_matchers.Tpo $(DEPDIR)/check_clamav-check_matchers.Po |
496 | 510 |
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check_matchers.c' object='check_clamav-check_matchers.o' libtool=no @AMDEPBACKSLASH@ |
497 | 511 |
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
498 |
-@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 |
|
512 |
+@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 |
|
499 | 513 |
|
500 | 514 |
check_clamav-check_matchers.obj: check_matchers.c |
501 |
-@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` |
|
515 |
+@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` |
|
502 | 516 |
@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_clamav-check_matchers.Tpo $(DEPDIR)/check_clamav-check_matchers.Po |
503 | 517 |
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check_matchers.c' object='check_clamav-check_matchers.obj' libtool=no @AMDEPBACKSLASH@ |
504 | 518 |
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
505 |
-@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` |
|
519 |
+@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` |
|
506 | 520 |
|
507 | 521 |
mostlyclean-libtool: |
508 | 522 |
-rm -f *.lo |
... | ... |
@@ -660,11 +590,8 @@ check-am: all-am |
660 | 660 |
$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) $(check_SCRIPTS) |
661 | 661 |
$(MAKE) $(AM_MAKEFLAGS) check-TESTS |
662 | 662 |
check: check-am |
663 |
-all-am: Makefile $(PROGRAMS) $(SCRIPTS) |
|
663 |
+all-am: Makefile |
|
664 | 664 |
installdirs: |
665 |
- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"; do \ |
|
666 |
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ |
|
667 |
- done |
|
668 | 665 |
install: install-am |
669 | 666 |
install-exec: install-exec-am |
670 | 667 |
install-data: install-data-am |
... | ... |
@@ -693,8 +620,8 @@ maintainer-clean-generic: |
693 | 693 |
@ENABLE_COVERAGE_FALSE@clean-local: |
694 | 694 |
clean: clean-am |
695 | 695 |
|
696 |
-clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \ |
|
697 |
- clean-libtool clean-local mostlyclean-am |
|
696 |
+clean-am: clean-checkPROGRAMS clean-generic clean-libtool clean-local \ |
|
697 |
+ mostlyclean-am |
|
698 | 698 |
|
699 | 699 |
distclean: distclean-am |
700 | 700 |
-rm -rf ./$(DEPDIR) |
... | ... |
@@ -716,7 +643,7 @@ install-data-am: |
716 | 716 |
|
717 | 717 |
install-dvi: install-dvi-am |
718 | 718 |
|
719 |
-install-exec-am: install-binPROGRAMS install-dist_binSCRIPTS |
|
719 |
+install-exec-am: |
|
720 | 720 |
|
721 | 721 |
install-html: install-html-am |
722 | 722 |
|
... | ... |
@@ -728,7 +655,7 @@ install-pdf: install-pdf-am |
728 | 728 |
|
729 | 729 |
install-ps: install-ps-am |
730 | 730 |
|
731 |
-installcheck-am: installcheck-binPROGRAMS installcheck-dist_binSCRIPTS |
|
731 |
+installcheck-am: |
|
732 | 732 |
|
733 | 733 |
maintainer-clean: maintainer-clean-am |
734 | 734 |
-rm -rf ./$(DEPDIR) |
... | ... |
@@ -748,26 +675,23 @@ ps: ps-am |
748 | 748 |
|
749 | 749 |
ps-am: |
750 | 750 |
|
751 |
-uninstall-am: uninstall-binPROGRAMS uninstall-dist_binSCRIPTS |
|
751 |
+uninstall-am: |
|
752 | 752 |
|
753 | 753 |
.MAKE: install-am install-strip |
754 | 754 |
|
755 | 755 |
.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ |
756 |
- clean-binPROGRAMS clean-checkPROGRAMS clean-generic \ |
|
757 |
- clean-libtool clean-local ctags distclean distclean-compile \ |
|
758 |
- distclean-generic distclean-libtool distclean-tags distdir dvi \ |
|
759 |
- dvi-am html html-am info info-am install install-am \ |
|
760 |
- install-binPROGRAMS install-data install-data-am \ |
|
761 |
- install-dist_binSCRIPTS install-dvi install-dvi-am \ |
|
762 |
- install-exec install-exec-am install-html install-html-am \ |
|
763 |
- install-info install-info-am install-man install-pdf \ |
|
764 |
- install-pdf-am install-ps install-ps-am install-strip \ |
|
765 |
- installcheck installcheck-am installcheck-binPROGRAMS \ |
|
766 |
- installcheck-dist_binSCRIPTS installdirs maintainer-clean \ |
|
756 |
+ clean-checkPROGRAMS clean-generic clean-libtool clean-local \ |
|
757 |
+ ctags distclean distclean-compile distclean-generic \ |
|
758 |
+ distclean-libtool distclean-tags distdir dvi dvi-am html \ |
|
759 |
+ html-am info info-am install install-am install-data \ |
|
760 |
+ install-data-am install-dvi install-dvi-am install-exec \ |
|
761 |
+ install-exec-am install-html install-html-am install-info \ |
|
762 |
+ install-info-am install-man install-pdf install-pdf-am \ |
|
763 |
+ install-ps install-ps-am install-strip installcheck \ |
|
764 |
+ installcheck-am installdirs maintainer-clean \ |
|
767 | 765 |
maintainer-clean-generic mostlyclean mostlyclean-compile \ |
768 | 766 |
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ |
769 |
- tags uninstall uninstall-am uninstall-binPROGRAMS \ |
|
770 |
- uninstall-dist_binSCRIPTS |
|
767 |
+ tags uninstall uninstall-am |
|
771 | 768 |
|
772 | 769 |
|
773 | 770 |
check_clamd.sh: $(FILES) |
... | ... |
@@ -4,15 +4,6 @@ |
4 | 4 |
|
5 | 5 |
#include <stdio.h> |
6 | 6 |
|
7 |
-#ifndef HAVE_CHECK |
|
8 |
-int main(int argc, char **argv) |
|
9 |
-{ |
|
10 |
- puts("\n*** Unit tests disabled in this build\n*** Use ./configure --enable-check to enable them\n"); |
|
11 |
- /* tell automake the test was skipped */ |
|
12 |
- return 77; |
|
13 |
-} |
|
14 |
-#else |
|
15 |
- |
|
16 | 7 |
#include <stdlib.h> |
17 | 8 |
#include <limits.h> |
18 | 9 |
#include <fcntl.h> |
... | ... |
@@ -368,5 +359,3 @@ int main(int argc, char **argv) |
368 | 368 |
srunner_free(sr); |
369 | 369 |
return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE; |
370 | 370 |
} |
371 |
- |
|
372 |
-#endif /* HAVE_CHECK */ |