git-svn: trunk@4163
Török Edvin authored on 2008/09/02 20:52:53... | ... |
@@ -167,8 +167,6 @@ LCOV = @LCOV@ |
167 | 167 |
LDFLAGS = @LDFLAGS@ |
168 | 168 |
LIBBZ2 = @LIBBZ2@ |
169 | 169 |
LIBBZ2_PREFIX = @LIBBZ2_PREFIX@ |
170 |
-LIBCHECK = @LIBCHECK@ |
|
171 |
-LIBCHECK_PREFIX = @LIBCHECK_PREFIX@ |
|
172 | 170 |
LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@ |
173 | 171 |
LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@ |
174 | 172 |
LIBGMP = @LIBGMP@ |
... | ... |
@@ -178,7 +176,6 @@ LIBS = @LIBS@ |
178 | 178 |
LIBTOOL = @LIBTOOL@ |
179 | 179 |
LN_S = @LN_S@ |
180 | 180 |
LTLIBBZ2 = @LTLIBBZ2@ |
181 |
-LTLIBCHECK = @LTLIBCHECK@ |
|
182 | 181 |
LTLIBGMP = @LTLIBGMP@ |
183 | 182 |
LTLIBOBJS = @LTLIBOBJS@ |
184 | 183 |
MAINT = @MAINT@ |
... | ... |
@@ -150,8 +150,6 @@ LCOV = @LCOV@ |
150 | 150 |
LDFLAGS = @LDFLAGS@ |
151 | 151 |
LIBBZ2 = @LIBBZ2@ |
152 | 152 |
LIBBZ2_PREFIX = @LIBBZ2_PREFIX@ |
153 |
-LIBCHECK = @LIBCHECK@ |
|
154 |
-LIBCHECK_PREFIX = @LIBCHECK_PREFIX@ |
|
155 | 153 |
LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@ |
156 | 154 |
LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@ |
157 | 155 |
LIBGMP = @LIBGMP@ |
... | ... |
@@ -161,7 +159,6 @@ LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMAV_MILTER_LIBS@ @THREAD_LIBS@ |
161 | 161 |
LIBTOOL = @LIBTOOL@ |
162 | 162 |
LN_S = @LN_S@ |
163 | 163 |
LTLIBBZ2 = @LTLIBBZ2@ |
164 |
-LTLIBCHECK = @LTLIBCHECK@ |
|
165 | 164 |
LTLIBGMP = @LTLIBGMP@ |
166 | 165 |
LTLIBOBJS = @LTLIBOBJS@ |
167 | 166 |
MAINT = @MAINT@ |
... | ... |
@@ -135,8 +135,6 @@ LCOV = @LCOV@ |
135 | 135 |
LDFLAGS = @LDFLAGS@ |
136 | 136 |
LIBBZ2 = @LIBBZ2@ |
137 | 137 |
LIBBZ2_PREFIX = @LIBBZ2_PREFIX@ |
138 |
-LIBCHECK = @LIBCHECK@ |
|
139 |
-LIBCHECK_PREFIX = @LIBCHECK_PREFIX@ |
|
140 | 138 |
LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@ |
141 | 139 |
LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@ |
142 | 140 |
LIBGMP = @LIBGMP@ |
... | ... |
@@ -146,7 +144,6 @@ LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@ |
146 | 146 |
LIBTOOL = @LIBTOOL@ |
147 | 147 |
LN_S = @LN_S@ |
148 | 148 |
LTLIBBZ2 = @LTLIBBZ2@ |
149 |
-LTLIBCHECK = @LTLIBCHECK@ |
|
150 | 149 |
LTLIBGMP = @LTLIBGMP@ |
151 | 150 |
LTLIBOBJS = @LTLIBOBJS@ |
152 | 151 |
MAINT = @MAINT@ |
... | ... |
@@ -155,8 +155,6 @@ LCOV = @LCOV@ |
155 | 155 |
LDFLAGS = @LDFLAGS@ |
156 | 156 |
LIBBZ2 = @LIBBZ2@ |
157 | 157 |
LIBBZ2_PREFIX = @LIBBZ2_PREFIX@ |
158 |
-LIBCHECK = @LIBCHECK@ |
|
159 |
-LIBCHECK_PREFIX = @LIBCHECK_PREFIX@ |
|
160 | 158 |
LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@ |
161 | 159 |
LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@ |
162 | 160 |
LIBGMP = @LIBGMP@ |
... | ... |
@@ -166,7 +164,6 @@ LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMD_LIBS@ @THREAD_LIBS@ |
166 | 166 |
LIBTOOL = @LIBTOOL@ |
167 | 167 |
LN_S = @LN_S@ |
168 | 168 |
LTLIBBZ2 = @LTLIBBZ2@ |
169 |
-LTLIBCHECK = @LTLIBCHECK@ |
|
170 | 169 |
LTLIBGMP = @LTLIBGMP@ |
171 | 170 |
LTLIBOBJS = @LTLIBOBJS@ |
172 | 171 |
MAINT = @MAINT@ |
... | ... |
@@ -146,8 +146,6 @@ LCOV = @LCOV@ |
146 | 146 |
LDFLAGS = @LDFLAGS@ |
147 | 147 |
LIBBZ2 = @LIBBZ2@ |
148 | 148 |
LIBBZ2_PREFIX = @LIBBZ2_PREFIX@ |
149 |
-LIBCHECK = @LIBCHECK@ |
|
150 |
-LIBCHECK_PREFIX = @LIBCHECK_PREFIX@ |
|
151 | 149 |
LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@ |
152 | 150 |
LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@ |
153 | 151 |
LIBGMP = @LIBGMP@ |
... | ... |
@@ -157,7 +155,6 @@ LIBS = $(top_builddir)/libclamav/libclamav_internal_utils.la @FRESHCLAM_LIBS@ |
157 | 157 |
LIBTOOL = @LIBTOOL@ |
158 | 158 |
LN_S = @LN_S@ |
159 | 159 |
LTLIBBZ2 = @LTLIBBZ2@ |
160 |
-LTLIBCHECK = @LTLIBCHECK@ |
|
161 | 160 |
LTLIBGMP = @LTLIBGMP@ |
162 | 161 |
LTLIBOBJS = @LTLIBOBJS@ |
163 | 162 |
MAINT = @MAINT@ |
... | ... |
@@ -137,8 +137,6 @@ LCOV = @LCOV@ |
137 | 137 |
LDFLAGS = @LDFLAGS@ |
138 | 138 |
LIBBZ2 = @LIBBZ2@ |
139 | 139 |
LIBBZ2_PREFIX = @LIBBZ2_PREFIX@ |
140 |
-LIBCHECK = @LIBCHECK@ |
|
141 |
-LIBCHECK_PREFIX = @LIBCHECK_PREFIX@ |
|
142 | 140 |
LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@ |
143 | 141 |
LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@ |
144 | 142 |
LIBGMP = @LIBGMP@ |
... | ... |
@@ -148,7 +146,6 @@ LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@ |
148 | 148 |
LIBTOOL = @LIBTOOL@ |
149 | 149 |
LN_S = @LN_S@ |
150 | 150 |
LTLIBBZ2 = @LTLIBBZ2@ |
151 |
-LTLIBCHECK = @LTLIBCHECK@ |
|
152 | 151 |
LTLIBGMP = @LTLIBGMP@ |
153 | 152 |
LTLIBOBJS = @LTLIBOBJS@ |
154 | 153 |
MAINT = @MAINT@ |
... | ... |
@@ -871,9 +871,6 @@ GPERF |
871 | 871 |
PKG_CONFIG |
872 | 872 |
CHECK_CFLAGS |
873 | 873 |
CHECK_LIBS |
874 |
-LIBCHECK |
|
875 |
-LTLIBCHECK |
|
876 |
-LIBCHECK_PREFIX |
|
877 | 874 |
GCOV |
878 | 875 |
LCOV |
879 | 876 |
GENHTML |
... | ... |
@@ -1514,13 +1511,13 @@ Optional Features: |
1514 | 1514 |
--disable-gcc-vcheck do not check for buggy gcc version |
1515 | 1515 |
--enable-experimental enable experimental code |
1516 | 1516 |
--enable-check Enable 'check' unit tests (default=auto) |
1517 |
- --disable-rpath do not hardcode runtime library paths |
|
1518 | 1517 |
--enable-tests-install install unit tests [default=no] |
1519 | 1518 |
--enable-coverage turn on test coverage [default=no] |
1520 | 1519 |
--enable-maintainer-mode enable make rules and dependencies not useful |
1521 | 1520 |
(and sometimes confusing) to the casual installer |
1522 | 1521 |
--disable-zlib-vcheck do not check for buggy zlib version |
1523 | 1522 |
--disable-bzip2 disable bzip2 support |
1523 |
+ --disable-rpath do not hardcode runtime library paths |
|
1524 | 1524 |
--disable-unrar don't build libclamunrar and libclamunrar_iface |
1525 | 1525 |
--disable-ipv6 disable IPv6 support |
1526 | 1526 |
--disable-dns disable support for database verification through |
... | ... |
@@ -1548,11 +1545,9 @@ Optional Packages: |
1548 | 1548 |
--with-pic try to use only PIC/non-PIC objects [default=use |
1549 | 1549 |
both] |
1550 | 1550 |
--with-fpu-words-bigendian=(yes/no/auto) specify FPU endianess (default=auto) |
1551 |
- --with-gnu-ld assume the C compiler uses GNU ld default=no |
|
1552 |
- --with-libcheck-prefix[=DIR] search for libcheck in DIR/include and DIR/lib |
|
1553 |
- --without-libcheck-prefix don't search for libcheck in includedir and libdir |
|
1554 | 1551 |
--with-zlib=DIR path to directory containing zlib library (default= |
1555 | 1552 |
/usr/local or /usr if not found in /usr/local) |
1553 |
+ --with-gnu-ld assume the C compiler uses GNU ld default=no |
|
1556 | 1554 |
--with-libbz2-prefix[=DIR] search for libbz2 in DIR/include and DIR/lib |
1557 | 1555 |
--without-libbz2-prefix don't search for libbz2 in includedir and libdir |
1558 | 1556 |
--with-libgmp-prefix[=DIR] search for libgmp in DIR/include and DIR/lib |
... | ... |
@@ -4792,7 +4787,7 @@ ia64-*-hpux*) |
4792 | 4792 |
;; |
4793 | 4793 |
*-*-irix6*) |
4794 | 4794 |
# Find out which ABI we are using. |
4795 |
- echo '#line 4795 "configure"' > conftest.$ac_ext |
|
4795 |
+ echo '#line 4790 "configure"' > conftest.$ac_ext |
|
4796 | 4796 |
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
4797 | 4797 |
(eval $ac_compile) 2>&5 |
4798 | 4798 |
ac_status=$? |
... | ... |
@@ -6882,11 +6877,11 @@ else |
6882 | 6882 |
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
6883 | 6883 |
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
6884 | 6884 |
-e 's:$: $lt_compiler_flag:'` |
6885 |
- (eval echo "\"\$as_me:6885: $lt_compile\"" >&5) |
|
6885 |
+ (eval echo "\"\$as_me:6880: $lt_compile\"" >&5) |
|
6886 | 6886 |
(eval "$lt_compile" 2>conftest.err) |
6887 | 6887 |
ac_status=$? |
6888 | 6888 |
cat conftest.err >&5 |
6889 |
- echo "$as_me:6889: \$? = $ac_status" >&5 |
|
6889 |
+ echo "$as_me:6884: \$? = $ac_status" >&5 |
|
6890 | 6890 |
if (exit $ac_status) && test -s "$ac_outfile"; then |
6891 | 6891 |
# The compiler can only warn and ignore the option if not recognized |
6892 | 6892 |
# So say no if there are warnings other than the usual output. |
... | ... |
@@ -7172,11 +7167,11 @@ else |
7172 | 7172 |
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
7173 | 7173 |
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
7174 | 7174 |
-e 's:$: $lt_compiler_flag:'` |
7175 |
- (eval echo "\"\$as_me:7175: $lt_compile\"" >&5) |
|
7175 |
+ (eval echo "\"\$as_me:7170: $lt_compile\"" >&5) |
|
7176 | 7176 |
(eval "$lt_compile" 2>conftest.err) |
7177 | 7177 |
ac_status=$? |
7178 | 7178 |
cat conftest.err >&5 |
7179 |
- echo "$as_me:7179: \$? = $ac_status" >&5 |
|
7179 |
+ echo "$as_me:7174: \$? = $ac_status" >&5 |
|
7180 | 7180 |
if (exit $ac_status) && test -s "$ac_outfile"; then |
7181 | 7181 |
# The compiler can only warn and ignore the option if not recognized |
7182 | 7182 |
# So say no if there are warnings other than the usual output. |
... | ... |
@@ -7276,11 +7271,11 @@ else |
7276 | 7276 |
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
7277 | 7277 |
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
7278 | 7278 |
-e 's:$: $lt_compiler_flag:'` |
7279 |
- (eval echo "\"\$as_me:7279: $lt_compile\"" >&5) |
|
7279 |
+ (eval echo "\"\$as_me:7274: $lt_compile\"" >&5) |
|
7280 | 7280 |
(eval "$lt_compile" 2>out/conftest.err) |
7281 | 7281 |
ac_status=$? |
7282 | 7282 |
cat out/conftest.err >&5 |
7283 |
- echo "$as_me:7283: \$? = $ac_status" >&5 |
|
7283 |
+ echo "$as_me:7278: \$? = $ac_status" >&5 |
|
7284 | 7284 |
if (exit $ac_status) && test -s out/conftest2.$ac_objext |
7285 | 7285 |
then |
7286 | 7286 |
# The compiler can only warn and ignore the option if not recognized |
... | ... |
@@ -9653,7 +9648,7 @@ else |
9653 | 9653 |
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
9654 | 9654 |
lt_status=$lt_dlunknown |
9655 | 9655 |
cat > conftest.$ac_ext <<EOF |
9656 |
-#line 9656 "configure" |
|
9656 |
+#line 9651 "configure" |
|
9657 | 9657 |
#include "confdefs.h" |
9658 | 9658 |
|
9659 | 9659 |
#if HAVE_DLFCN_H |
... | ... |
@@ -9753,7 +9748,7 @@ else |
9753 | 9753 |
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
9754 | 9754 |
lt_status=$lt_dlunknown |
9755 | 9755 |
cat > conftest.$ac_ext <<EOF |
9756 |
-#line 9756 "configure" |
|
9756 |
+#line 9751 "configure" |
|
9757 | 9757 |
#include "confdefs.h" |
9758 | 9758 |
|
9759 | 9759 |
#if HAVE_DLFCN_H |
... | ... |
@@ -12988,683 +12983,9 @@ fi |
12988 | 12988 |
save_LIBS="$LIBS" |
12989 | 12989 |
if test -z "$CHECK_LIBS"; then |
12990 | 12990 |
# when pkg-config is not available, use defaults |
12991 |
- |
|
12992 |
- if test "X$prefix" = "XNONE"; then |
|
12993 |
- acl_final_prefix="$ac_default_prefix" |
|
12994 |
- else |
|
12995 |
- acl_final_prefix="$prefix" |
|
12996 |
- fi |
|
12997 |
- if test "X$exec_prefix" = "XNONE"; then |
|
12998 |
- acl_final_exec_prefix='${prefix}' |
|
12999 |
- else |
|
13000 |
- acl_final_exec_prefix="$exec_prefix" |
|
13001 |
- fi |
|
13002 |
- acl_save_prefix="$prefix" |
|
13003 |
- prefix="$acl_final_prefix" |
|
13004 |
- eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" |
|
13005 |
- prefix="$acl_save_prefix" |
|
13006 |
- |
|
13007 |
- |
|
13008 |
-# Check whether --with-gnu-ld was given. |
|
13009 |
-if test "${with_gnu_ld+set}" = set; then |
|
13010 |
- withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes |
|
13011 |
-else |
|
13012 |
- with_gnu_ld=no |
|
13013 |
-fi |
|
13014 |
- |
|
13015 |
-# Prepare PATH_SEPARATOR. |
|
13016 |
-# The user is always right. |
|
13017 |
-if test "${PATH_SEPARATOR+set}" != set; then |
|
13018 |
- echo "#! /bin/sh" >conf$$.sh |
|
13019 |
- echo "exit 0" >>conf$$.sh |
|
13020 |
- chmod +x conf$$.sh |
|
13021 |
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then |
|
13022 |
- PATH_SEPARATOR=';' |
|
13023 |
- else |
|
13024 |
- PATH_SEPARATOR=: |
|
13025 |
- fi |
|
13026 |
- rm -f conf$$.sh |
|
13027 |
-fi |
|
13028 |
-ac_prog=ld |
|
13029 |
-if test "$GCC" = yes; then |
|
13030 |
- # Check if gcc -print-prog-name=ld gives a path. |
|
13031 |
- { echo "$as_me:$LINENO: checking for ld used by GCC" >&5 |
|
13032 |
-echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6; } |
|
13033 |
- case $host in |
|
13034 |
- *-*-mingw*) |
|
13035 |
- # gcc leaves a trailing carriage return which upsets mingw |
|
13036 |
- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; |
|
13037 |
- *) |
|
13038 |
- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; |
|
13039 |
- esac |
|
13040 |
- case $ac_prog in |
|
13041 |
- # Accept absolute paths. |
|
13042 |
- [\\/]* | [A-Za-z]:[\\/]*) |
|
13043 |
- re_direlt='/[^/][^/]*/\.\./' |
|
13044 |
- # Canonicalize the path of ld |
|
13045 |
- ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` |
|
13046 |
- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do |
|
13047 |
- ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` |
|
13048 |
- done |
|
13049 |
- test -z "$LD" && LD="$ac_prog" |
|
13050 |
- ;; |
|
13051 |
- "") |
|
13052 |
- # If it fails, then pretend we aren't using GCC. |
|
13053 |
- ac_prog=ld |
|
13054 |
- ;; |
|
13055 |
- *) |
|
13056 |
- # If it is relative, then search for the first ld in PATH. |
|
13057 |
- with_gnu_ld=unknown |
|
13058 |
- ;; |
|
13059 |
- esac |
|
13060 |
-elif test "$with_gnu_ld" = yes; then |
|
13061 |
- { echo "$as_me:$LINENO: checking for GNU ld" >&5 |
|
13062 |
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } |
|
13063 |
-else |
|
13064 |
- { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 |
|
13065 |
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } |
|
13066 |
-fi |
|
13067 |
-if test "${acl_cv_path_LD+set}" = set; then |
|
13068 |
- echo $ECHO_N "(cached) $ECHO_C" >&6 |
|
13069 |
-else |
|
13070 |
- if test -z "$LD"; then |
|
13071 |
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" |
|
13072 |
- for ac_dir in $PATH; do |
|
13073 |
- test -z "$ac_dir" && ac_dir=. |
|
13074 |
- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then |
|
13075 |
- acl_cv_path_LD="$ac_dir/$ac_prog" |
|
13076 |
- # Check to see if the program is GNU ld. I'd rather use --version, |
|
13077 |
- # but apparently some GNU ld's only accept -v. |
|
13078 |
- # Break only if it was the GNU/non-GNU ld that we prefer. |
|
13079 |
- case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in |
|
13080 |
- *GNU* | *'with BFD'*) |
|
13081 |
- test "$with_gnu_ld" != no && break ;; |
|
13082 |
- *) |
|
13083 |
- test "$with_gnu_ld" != yes && break ;; |
|
13084 |
- esac |
|
13085 |
- fi |
|
13086 |
- done |
|
13087 |
- IFS="$ac_save_ifs" |
|
13088 |
-else |
|
13089 |
- acl_cv_path_LD="$LD" # Let the user override the test with a path. |
|
13090 |
-fi |
|
13091 |
-fi |
|
13092 |
- |
|
13093 |
-LD="$acl_cv_path_LD" |
|
13094 |
-if test -n "$LD"; then |
|
13095 |
- { echo "$as_me:$LINENO: result: $LD" >&5 |
|
13096 |
-echo "${ECHO_T}$LD" >&6; } |
|
13097 |
-else |
|
13098 |
- { echo "$as_me:$LINENO: result: no" >&5 |
|
13099 |
-echo "${ECHO_T}no" >&6; } |
|
13100 |
-fi |
|
13101 |
-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 |
|
13102 |
-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} |
|
13103 |
- { (exit 1); exit 1; }; } |
|
13104 |
-{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 |
|
13105 |
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } |
|
13106 |
-if test "${acl_cv_prog_gnu_ld+set}" = set; then |
|
13107 |
- echo $ECHO_N "(cached) $ECHO_C" >&6 |
|
13108 |
-else |
|
13109 |
- # I'd rather use --version here, but apparently some GNU ld's only accept -v. |
|
13110 |
-case `$LD -v 2>&1 </dev/null` in |
|
13111 |
-*GNU* | *'with BFD'*) |
|
13112 |
- acl_cv_prog_gnu_ld=yes ;; |
|
13113 |
-*) |
|
13114 |
- acl_cv_prog_gnu_ld=no ;; |
|
13115 |
-esac |
|
13116 |
-fi |
|
13117 |
-{ echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5 |
|
13118 |
-echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6; } |
|
13119 |
-with_gnu_ld=$acl_cv_prog_gnu_ld |
|
13120 |
- |
|
13121 |
- |
|
13122 |
- |
|
13123 |
- |
|
13124 |
- { echo "$as_me:$LINENO: checking for shared library run path origin" >&5 |
|
13125 |
-echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6; } |
|
13126 |
-if test "${acl_cv_rpath+set}" = set; then |
|
13127 |
- echo $ECHO_N "(cached) $ECHO_C" >&6 |
|
13128 |
-else |
|
13129 |
- |
|
13130 |
- CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ |
|
13131 |
- ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh |
|
13132 |
- . ./conftest.sh |
|
13133 |
- rm -f ./conftest.sh |
|
13134 |
- acl_cv_rpath=done |
|
13135 |
- |
|
13136 |
-fi |
|
13137 |
-{ echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5 |
|
13138 |
-echo "${ECHO_T}$acl_cv_rpath" >&6; } |
|
13139 |
- wl="$acl_cv_wl" |
|
13140 |
- acl_libext="$acl_cv_libext" |
|
13141 |
- acl_shlibext="$acl_cv_shlibext" |
|
13142 |
- acl_libname_spec="$acl_cv_libname_spec" |
|
13143 |
- acl_library_names_spec="$acl_cv_library_names_spec" |
|
13144 |
- acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" |
|
13145 |
- acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" |
|
13146 |
- acl_hardcode_direct="$acl_cv_hardcode_direct" |
|
13147 |
- acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" |
|
13148 |
- # Check whether --enable-rpath was given. |
|
13149 |
-if test "${enable_rpath+set}" = set; then |
|
13150 |
- enableval=$enable_rpath; : |
|
13151 |
-else |
|
13152 |
- enable_rpath=yes |
|
13153 |
-fi |
|
13154 |
- |
|
13155 |
- |
|
13156 |
- |
|
13157 |
- acl_libdirstem=lib |
|
13158 |
- searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` |
|
13159 |
- if test -n "$searchpath"; then |
|
13160 |
- acl_save_IFS="${IFS= }"; IFS=":" |
|
13161 |
- for searchdir in $searchpath; do |
|
13162 |
- if test -d "$searchdir"; then |
|
13163 |
- case "$searchdir" in |
|
13164 |
- */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; |
|
13165 |
- *) searchdir=`cd "$searchdir" && pwd` |
|
13166 |
- case "$searchdir" in |
|
13167 |
- */lib64 ) acl_libdirstem=lib64 ;; |
|
13168 |
- esac ;; |
|
13169 |
- esac |
|
13170 |
- fi |
|
13171 |
- done |
|
13172 |
- IFS="$acl_save_IFS" |
|
13173 |
- fi |
|
13174 |
- |
|
13175 |
- |
|
13176 |
- |
|
13177 |
- |
|
13178 |
- |
|
13179 |
- |
|
13180 |
- { echo "$as_me:$LINENO: checking how to link with libcheck" >&5 |
|
13181 |
-echo $ECHO_N "checking how to link with libcheck... $ECHO_C" >&6; } |
|
13182 |
-if test "${ac_cv_libcheck_libs+set}" = set; then |
|
13183 |
- echo $ECHO_N "(cached) $ECHO_C" >&6 |
|
13184 |
-else |
|
13185 |
- |
|
13186 |
- |
|
13187 |
- |
|
13188 |
- |
|
13189 |
- |
|
13190 |
- use_additional=yes |
|
13191 |
- |
|
13192 |
- acl_save_prefix="$prefix" |
|
13193 |
- prefix="$acl_final_prefix" |
|
13194 |
- acl_save_exec_prefix="$exec_prefix" |
|
13195 |
- exec_prefix="$acl_final_exec_prefix" |
|
13196 |
- |
|
13197 |
- eval additional_includedir=\"$includedir\" |
|
13198 |
- eval additional_libdir=\"$libdir\" |
|
13199 |
- |
|
13200 |
- exec_prefix="$acl_save_exec_prefix" |
|
13201 |
- prefix="$acl_save_prefix" |
|
13202 |
- |
|
13203 |
- |
|
13204 |
-# Check whether --with-libcheck-prefix was given. |
|
13205 |
-if test "${with_libcheck_prefix+set}" = set; then |
|
13206 |
- withval=$with_libcheck_prefix; |
|
13207 |
- if test "X$withval" = "Xno"; then |
|
13208 |
- use_additional=no |
|
13209 |
- else |
|
13210 |
- if test "X$withval" = "X"; then |
|
13211 |
- |
|
13212 |
- acl_save_prefix="$prefix" |
|
13213 |
- prefix="$acl_final_prefix" |
|
13214 |
- acl_save_exec_prefix="$exec_prefix" |
|
13215 |
- exec_prefix="$acl_final_exec_prefix" |
|
13216 |
- |
|
13217 |
- eval additional_includedir=\"$includedir\" |
|
13218 |
- eval additional_libdir=\"$libdir\" |
|
13219 |
- |
|
13220 |
- exec_prefix="$acl_save_exec_prefix" |
|
13221 |
- prefix="$acl_save_prefix" |
|
13222 |
- |
|
13223 |
- else |
|
13224 |
- additional_includedir="$withval/include" |
|
13225 |
- additional_libdir="$withval/$acl_libdirstem" |
|
13226 |
- fi |
|
13227 |
- fi |
|
13228 |
- |
|
13229 |
-fi |
|
13230 |
- |
|
13231 |
- LIBCHECK= |
|
13232 |
- LTLIBCHECK= |
|
13233 |
- INCCHECK= |
|
13234 |
- LIBCHECK_PREFIX= |
|
13235 |
- rpathdirs= |
|
13236 |
- ltrpathdirs= |
|
13237 |
- names_already_handled= |
|
13238 |
- names_next_round='check ' |
|
13239 |
- while test -n "$names_next_round"; do |
|
13240 |
- names_this_round="$names_next_round" |
|
13241 |
- names_next_round= |
|
13242 |
- for name in $names_this_round; do |
|
13243 |
- already_handled= |
|
13244 |
- for n in $names_already_handled; do |
|
13245 |
- if test "$n" = "$name"; then |
|
13246 |
- already_handled=yes |
|
13247 |
- break |
|
13248 |
- fi |
|
13249 |
- done |
|
13250 |
- if test -z "$already_handled"; then |
|
13251 |
- names_already_handled="$names_already_handled $name" |
|
13252 |
- uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` |
|
13253 |
- eval value=\"\$HAVE_LIB$uppername\" |
|
13254 |
- if test -n "$value"; then |
|
13255 |
- if test "$value" = yes; then |
|
13256 |
- eval value=\"\$LIB$uppername\" |
|
13257 |
- test -z "$value" || LIBCHECK="${LIBCHECK}${LIBCHECK:+ }$value" |
|
13258 |
- eval value=\"\$LTLIB$uppername\" |
|
13259 |
- test -z "$value" || LTLIBCHECK="${LTLIBCHECK}${LTLIBCHECK:+ }$value" |
|
13260 |
- else |
|
13261 |
- : |
|
13262 |
- fi |
|
13263 |
- else |
|
13264 |
- found_dir= |
|
13265 |
- found_la= |
|
13266 |
- found_so= |
|
13267 |
- found_a= |
|
13268 |
- eval libname=\"$acl_libname_spec\" # typically: libname=lib$name |
|
13269 |
- if test -n "$acl_shlibext"; then |
|
13270 |
- shrext=".$acl_shlibext" # typically: shrext=.so |
|
13271 |
- else |
|
13272 |
- shrext= |
|
13273 |
- fi |
|
13274 |
- if test $use_additional = yes; then |
|
13275 |
- dir="$additional_libdir" |
|
13276 |
- if test -n "$acl_shlibext"; then |
|
13277 |
- if test -f "$dir/$libname$shrext"; then |
|
13278 |
- found_dir="$dir" |
|
13279 |
- found_so="$dir/$libname$shrext" |
|
13280 |
- else |
|
13281 |
- if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then |
|
13282 |
- ver=`(cd "$dir" && \ |
|
13283 |
- for f in "$libname$shrext".*; do echo "$f"; done \ |
|
13284 |
- | sed -e "s,^$libname$shrext\\\\.,," \ |
|
13285 |
- | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ |
|
13286 |
- | sed 1q ) 2>/dev/null` |
|
13287 |
- if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then |
|
13288 |
- found_dir="$dir" |
|
13289 |
- found_so="$dir/$libname$shrext.$ver" |
|
13290 |
- fi |
|
13291 |
- else |
|
13292 |
- eval library_names=\"$acl_library_names_spec\" |
|
13293 |
- for f in $library_names; do |
|
13294 |
- if test -f "$dir/$f"; then |
|
13295 |
- found_dir="$dir" |
|
13296 |
- found_so="$dir/$f" |
|
13297 |
- break |
|
13298 |
- fi |
|
13299 |
- done |
|
13300 |
- fi |
|
13301 |
- fi |
|
13302 |
- fi |
|
13303 |
- if test "X$found_dir" = "X"; then |
|
13304 |
- if test -f "$dir/$libname.$acl_libext"; then |
|
13305 |
- found_dir="$dir" |
|
13306 |
- found_a="$dir/$libname.$acl_libext" |
|
13307 |
- fi |
|
13308 |
- fi |
|
13309 |
- if test "X$found_dir" != "X"; then |
|
13310 |
- if test -f "$dir/$libname.la"; then |
|
13311 |
- found_la="$dir/$libname.la" |
|
13312 |
- fi |
|
13313 |
- fi |
|
13314 |
- fi |
|
13315 |
- if test "X$found_dir" = "X"; then |
|
13316 |
- for x in $LDFLAGS $LTLIBCHECK; do |
|
13317 |
- |
|
13318 |
- acl_save_prefix="$prefix" |
|
13319 |
- prefix="$acl_final_prefix" |
|
13320 |
- acl_save_exec_prefix="$exec_prefix" |
|
13321 |
- exec_prefix="$acl_final_exec_prefix" |
|
13322 |
- eval x=\"$x\" |
|
13323 |
- exec_prefix="$acl_save_exec_prefix" |
|
13324 |
- prefix="$acl_save_prefix" |
|
13325 |
- |
|
13326 |
- case "$x" in |
|
13327 |
- -L*) |
|
13328 |
- dir=`echo "X$x" | sed -e 's/^X-L//'` |
|
13329 |
- if test -n "$acl_shlibext"; then |
|
13330 |
- if test -f "$dir/$libname$shrext"; then |
|
13331 |
- found_dir="$dir" |
|
13332 |
- found_so="$dir/$libname$shrext" |
|
13333 |
- else |
|
13334 |
- if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then |
|
13335 |
- ver=`(cd "$dir" && \ |
|
13336 |
- for f in "$libname$shrext".*; do echo "$f"; done \ |
|
13337 |
- | sed -e "s,^$libname$shrext\\\\.,," \ |
|
13338 |
- | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ |
|
13339 |
- | sed 1q ) 2>/dev/null` |
|
13340 |
- if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then |
|
13341 |
- found_dir="$dir" |
|
13342 |
- found_so="$dir/$libname$shrext.$ver" |
|
13343 |
- fi |
|
13344 |
- else |
|
13345 |
- eval library_names=\"$acl_library_names_spec\" |
|
13346 |
- for f in $library_names; do |
|
13347 |
- if test -f "$dir/$f"; then |
|
13348 |
- found_dir="$dir" |
|
13349 |
- found_so="$dir/$f" |
|
13350 |
- break |
|
13351 |
- fi |
|
13352 |
- done |
|
13353 |
- fi |
|
13354 |
- fi |
|
13355 |
- fi |
|
13356 |
- if test "X$found_dir" = "X"; then |
|
13357 |
- if test -f "$dir/$libname.$acl_libext"; then |
|
13358 |
- found_dir="$dir" |
|
13359 |
- found_a="$dir/$libname.$acl_libext" |
|
13360 |
- fi |
|
13361 |
- fi |
|
13362 |
- if test "X$found_dir" != "X"; then |
|
13363 |
- if test -f "$dir/$libname.la"; then |
|
13364 |
- found_la="$dir/$libname.la" |
|
13365 |
- fi |
|
13366 |
- fi |
|
13367 |
- ;; |
|
13368 |
- esac |
|
13369 |
- if test "X$found_dir" != "X"; then |
|
13370 |
- break |
|
13371 |
- fi |
|
13372 |
- done |
|
13373 |
- fi |
|
13374 |
- if test "X$found_dir" != "X"; then |
|
13375 |
- LTLIBCHECK="${LTLIBCHECK}${LTLIBCHECK:+ }-L$found_dir -l$name" |
|
13376 |
- if test "X$found_so" != "X"; then |
|
13377 |
- if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then |
|
13378 |
- LIBCHECK="${LIBCHECK}${LIBCHECK:+ }$found_so" |
|
13379 |
- else |
|
13380 |
- haveit= |
|
13381 |
- for x in $ltrpathdirs; do |
|
13382 |
- if test "X$x" = "X$found_dir"; then |
|
13383 |
- haveit=yes |
|
13384 |
- break |
|
13385 |
- fi |
|
13386 |
- done |
|
13387 |
- if test -z "$haveit"; then |
|
13388 |
- ltrpathdirs="$ltrpathdirs $found_dir" |
|
13389 |
- fi |
|
13390 |
- if test "$acl_hardcode_direct" = yes; then |
|
13391 |
- LIBCHECK="${LIBCHECK}${LIBCHECK:+ }$found_so" |
|
13392 |
- else |
|
13393 |
- if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then |
|
13394 |
- LIBCHECK="${LIBCHECK}${LIBCHECK:+ }$found_so" |
|
13395 |
- haveit= |
|
13396 |
- for x in $rpathdirs; do |
|
13397 |
- if test "X$x" = "X$found_dir"; then |
|
13398 |
- haveit=yes |
|
13399 |
- break |
|
13400 |
- fi |
|
13401 |
- done |
|
13402 |
- if test -z "$haveit"; then |
|
13403 |
- rpathdirs="$rpathdirs $found_dir" |
|
13404 |
- fi |
|
13405 |
- else |
|
13406 |
- haveit= |
|
13407 |
- for x in $LDFLAGS $LIBCHECK; do |
|
13408 |
- |
|
13409 |
- acl_save_prefix="$prefix" |
|
13410 |
- prefix="$acl_final_prefix" |
|
13411 |
- acl_save_exec_prefix="$exec_prefix" |
|
13412 |
- exec_prefix="$acl_final_exec_prefix" |
|
13413 |
- eval x=\"$x\" |
|
13414 |
- exec_prefix="$acl_save_exec_prefix" |
|
13415 |
- prefix="$acl_save_prefix" |
|
13416 |
- |
|
13417 |
- if test "X$x" = "X-L$found_dir"; then |
|
13418 |
- haveit=yes |
|
13419 |
- break |
|
13420 |
- fi |
|
13421 |
- done |
|
13422 |
- if test -z "$haveit"; then |
|
13423 |
- LIBCHECK="${LIBCHECK}${LIBCHECK:+ }-L$found_dir" |
|
13424 |
- fi |
|
13425 |
- if test "$acl_hardcode_minus_L" != no; then |
|
13426 |
- LIBCHECK="${LIBCHECK}${LIBCHECK:+ }$found_so" |
|
13427 |
- else |
|
13428 |
- LIBCHECK="${LIBCHECK}${LIBCHECK:+ }-l$name" |
|
13429 |
- fi |
|
13430 |
- fi |
|
13431 |
- fi |
|
13432 |
- fi |
|
13433 |
- else |
|
13434 |
- if test "X$found_a" != "X"; then |
|
13435 |
- LIBCHECK="${LIBCHECK}${LIBCHECK:+ }$found_a" |
|
13436 |
- else |
|
13437 |
- LIBCHECK="${LIBCHECK}${LIBCHECK:+ }-L$found_dir -l$name" |
|
13438 |
- fi |
|
13439 |
- fi |
|
13440 |
- additional_includedir= |
|
13441 |
- case "$found_dir" in |
|
13442 |
- */$acl_libdirstem | */$acl_libdirstem/) |
|
13443 |
- basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` |
|
13444 |
- LIBCHECK_PREFIX="$basedir" |
|
13445 |
- additional_includedir="$basedir/include" |
|
13446 |
- ;; |
|
13447 |
- esac |
|
13448 |
- if test "X$additional_includedir" != "X"; then |
|
13449 |
- if test "X$additional_includedir" != "X/usr/include"; then |
|
13450 |
- haveit= |
|
13451 |
- if test "X$additional_includedir" = "X/usr/local/include"; then |
|
13452 |
- if test -n "$GCC"; then |
|
13453 |
- case $host_os in |
|
13454 |
- linux* | gnu* | k*bsd*-gnu) haveit=yes;; |
|
13455 |
- esac |
|
13456 |
- fi |
|
13457 |
- fi |
|
13458 |
- if test -z "$haveit"; then |
|
13459 |
- for x in $CPPFLAGS $INCCHECK; do |
|
13460 |
- |
|
13461 |
- acl_save_prefix="$prefix" |
|
13462 |
- prefix="$acl_final_prefix" |
|
13463 |
- acl_save_exec_prefix="$exec_prefix" |
|
13464 |
- exec_prefix="$acl_final_exec_prefix" |
|
13465 |
- eval x=\"$x\" |
|
13466 |
- exec_prefix="$acl_save_exec_prefix" |
|
13467 |
- prefix="$acl_save_prefix" |
|
13468 |
- |
|
13469 |
- if test "X$x" = "X-I$additional_includedir"; then |
|
13470 |
- haveit=yes |
|
13471 |
- break |
|
13472 |
- fi |
|
13473 |
- done |
|
13474 |
- if test -z "$haveit"; then |
|
13475 |
- if test -d "$additional_includedir"; then |
|
13476 |
- INCCHECK="${INCCHECK}${INCCHECK:+ }-I$additional_includedir" |
|
13477 |
- fi |
|
13478 |
- fi |
|
13479 |
- fi |
|
13480 |
- fi |
|
13481 |
- fi |
|
13482 |
- if test -n "$found_la"; then |
|
13483 |
- save_libdir="$libdir" |
|
13484 |
- case "$found_la" in |
|
13485 |
- */* | *\\*) . "$found_la" ;; |
|
13486 |
- *) . "./$found_la" ;; |
|
13487 |
- esac |
|
13488 |
- libdir="$save_libdir" |
|
13489 |
- for dep in $dependency_libs; do |
|
13490 |
- case "$dep" in |
|
13491 |
- -L*) |
|
13492 |
- additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` |
|
13493 |
- if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then |
|
13494 |
- haveit= |
|
13495 |
- if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then |
|
13496 |
- if test -n "$GCC"; then |
|
13497 |
- case $host_os in |
|
13498 |
- linux* | gnu* | k*bsd*-gnu) haveit=yes;; |
|
13499 |
- esac |
|
13500 |
- fi |
|
13501 |
- fi |
|
13502 |
- if test -z "$haveit"; then |
|
13503 |
- haveit= |
|
13504 |
- for x in $LDFLAGS $LIBCHECK; do |
|
13505 |
- |
|
13506 |
- acl_save_prefix="$prefix" |
|
13507 |
- prefix="$acl_final_prefix" |
|
13508 |
- acl_save_exec_prefix="$exec_prefix" |
|
13509 |
- exec_prefix="$acl_final_exec_prefix" |
|
13510 |
- eval x=\"$x\" |
|
13511 |
- exec_prefix="$acl_save_exec_prefix" |
|
13512 |
- prefix="$acl_save_prefix" |
|
13513 |
- |
|
13514 |
- if test "X$x" = "X-L$additional_libdir"; then |
|
13515 |
- haveit=yes |
|
13516 |
- break |
|
13517 |
- fi |
|
13518 |
- done |
|
13519 |
- if test -z "$haveit"; then |
|
13520 |
- if test -d "$additional_libdir"; then |
|
13521 |
- LIBCHECK="${LIBCHECK}${LIBCHECK:+ }-L$additional_libdir" |
|
13522 |
- fi |
|
13523 |
- fi |
|
13524 |
- haveit= |
|
13525 |
- for x in $LDFLAGS $LTLIBCHECK; do |
|
13526 |
- |
|
13527 |
- acl_save_prefix="$prefix" |
|
13528 |
- prefix="$acl_final_prefix" |
|
13529 |
- acl_save_exec_prefix="$exec_prefix" |
|
13530 |
- exec_prefix="$acl_final_exec_prefix" |
|
13531 |
- eval x=\"$x\" |
|
13532 |
- exec_prefix="$acl_save_exec_prefix" |
|
13533 |
- prefix="$acl_save_prefix" |
|
13534 |
- |
|
13535 |
- if test "X$x" = "X-L$additional_libdir"; then |
|
13536 |
- haveit=yes |
|
13537 |
- break |
|
13538 |
- fi |
|
13539 |
- done |
|
13540 |
- if test -z "$haveit"; then |
|
13541 |
- if test -d "$additional_libdir"; then |
|
13542 |
- LTLIBCHECK="${LTLIBCHECK}${LTLIBCHECK:+ }-L$additional_libdir" |
|
13543 |
- fi |
|
13544 |
- fi |
|
13545 |
- fi |
|
13546 |
- fi |
|
13547 |
- ;; |
|
13548 |
- -R*) |
|
13549 |
- dir=`echo "X$dep" | sed -e 's/^X-R//'` |
|
13550 |
- if test "$enable_rpath" != no; then |
|
13551 |
- haveit= |
|
13552 |
- for x in $rpathdirs; do |
|
13553 |
- if test "X$x" = "X$dir"; then |
|
13554 |
- haveit=yes |
|
13555 |
- break |
|
13556 |
- fi |
|
13557 |
- done |
|
13558 |
- if test -z "$haveit"; then |
|
13559 |
- rpathdirs="$rpathdirs $dir" |
|
13560 |
- fi |
|
13561 |
- haveit= |
|
13562 |
- for x in $ltrpathdirs; do |
|
13563 |
- if test "X$x" = "X$dir"; then |
|
13564 |
- haveit=yes |
|
13565 |
- break |
|
13566 |
- fi |
|
13567 |
- done |
|
13568 |
- if test -z "$haveit"; then |
|
13569 |
- ltrpathdirs="$ltrpathdirs $dir" |
|
13570 |
- fi |
|
13571 |
- fi |
|
13572 |
- ;; |
|
13573 |
- -l*) |
|
13574 |
- names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` |
|
13575 |
- ;; |
|
13576 |
- *.la) |
|
13577 |
- names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` |
|
13578 |
- ;; |
|
13579 |
- *) |
|
13580 |
- LIBCHECK="${LIBCHECK}${LIBCHECK:+ }$dep" |
|
13581 |
- LTLIBCHECK="${LTLIBCHECK}${LTLIBCHECK:+ }$dep" |
|
13582 |
- ;; |
|
13583 |
- esac |
|
13584 |
- done |
|
13585 |
- fi |
|
13586 |
- else |
|
13587 |
- LIBCHECK="${LIBCHECK}${LIBCHECK:+ }-l$name" |
|
13588 |
- LTLIBCHECK="${LTLIBCHECK}${LTLIBCHECK:+ }-l$name" |
|
13589 |
- fi |
|
13590 |
- fi |
|
13591 |
- fi |
|
13592 |
- done |
|
13593 |
- done |
|
13594 |
- if test "X$rpathdirs" != "X"; then |
|
13595 |
- if test -n "$acl_hardcode_libdir_separator"; then |
|
13596 |
- alldirs= |
|
13597 |
- for found_dir in $rpathdirs; do |
|
13598 |
- alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" |
|
13599 |
- done |
|
13600 |
- acl_save_libdir="$libdir" |
|
13601 |
- libdir="$alldirs" |
|
13602 |
- eval flag=\"$acl_hardcode_libdir_flag_spec\" |
|
13603 |
- libdir="$acl_save_libdir" |
|
13604 |
- LIBCHECK="${LIBCHECK}${LIBCHECK:+ }$flag" |
|
13605 |
- else |
|
13606 |
- for found_dir in $rpathdirs; do |
|
13607 |
- acl_save_libdir="$libdir" |
|
13608 |
- libdir="$found_dir" |
|
13609 |
- eval flag=\"$acl_hardcode_libdir_flag_spec\" |
|
13610 |
- libdir="$acl_save_libdir" |
|
13611 |
- LIBCHECK="${LIBCHECK}${LIBCHECK:+ }$flag" |
|
13612 |
- done |
|
13613 |
- fi |
|
13614 |
- fi |
|
13615 |
- if test "X$ltrpathdirs" != "X"; then |
|
13616 |
- for found_dir in $ltrpathdirs; do |
|
13617 |
- LTLIBCHECK="${LTLIBCHECK}${LTLIBCHECK:+ }-R$found_dir" |
|
13618 |
- done |
|
13619 |
- fi |
|
13620 |
- |
|
13621 |
- ac_cv_libcheck_libs="$LIBCHECK" |
|
13622 |
- ac_cv_libcheck_ltlibs="$LTLIBCHECK" |
|
13623 |
- ac_cv_libcheck_cppflags="$INCCHECK" |
|
13624 |
- ac_cv_libcheck_prefix="$LIBCHECK_PREFIX" |
|
13625 |
- |
|
13626 |
-fi |
|
13627 |
-{ echo "$as_me:$LINENO: result: $ac_cv_libcheck_libs" >&5 |
|
13628 |
-echo "${ECHO_T}$ac_cv_libcheck_libs" >&6; } |
|
13629 |
- LIBCHECK="$ac_cv_libcheck_libs" |
|
13630 |
- LTLIBCHECK="$ac_cv_libcheck_ltlibs" |
|
13631 |
- INCCHECK="$ac_cv_libcheck_cppflags" |
|
13632 |
- LIBCHECK_PREFIX="$ac_cv_libcheck_prefix" |
|
13633 |
- |
|
13634 |
- for element in $INCCHECK; do |
|
13635 |
- haveit= |
|
13636 |
- for x in $CPPFLAGS; do |
|
13637 |
- |
|
13638 |
- acl_save_prefix="$prefix" |
|
13639 |
- prefix="$acl_final_prefix" |
|
13640 |
- acl_save_exec_prefix="$exec_prefix" |
|
13641 |
- exec_prefix="$acl_final_exec_prefix" |
|
13642 |
- eval x=\"$x\" |
|
13643 |
- exec_prefix="$acl_save_exec_prefix" |
|
13644 |
- prefix="$acl_save_prefix" |
|
13645 |
- |
|
13646 |
- if test "X$x" = "X$element"; then |
|
13647 |
- haveit=yes |
|
13648 |
- break |
|
13649 |
- fi |
|
13650 |
- done |
|
13651 |
- if test -z "$haveit"; then |
|
13652 |
- CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" |
|
13653 |
- fi |
|
13654 |
- done |
|
13655 |
- |
|
13656 |
- |
|
13657 |
- |
|
13658 |
- |
|
13659 |
- HAVE_LIBCHECK=yes |
|
13660 |
- |
|
13661 |
- |
|
13662 |
- |
|
13663 |
- LIBS="$LIBS -L$LIBCHECK_PREFIX/lib -lcheck" |
|
13664 |
- CHECK_LIBS="$LTLIBCHECK" |
|
13665 |
- else |
|
13666 |
- LIBS="$LIBS $CHECK_LIBS" |
|
12991 |
+ CHECK_LIBS="-lcheck" |
|
13667 | 12992 |
fi |
12993 |
+ LIBS="$LIBS $CHECK_LIBS" |
|
13668 | 12994 |
if test "${ac_cv_header_check_h+set}" = set; then |
13669 | 12995 |
{ echo "$as_me:$LINENO: checking for check.h" >&5 |
13670 | 12996 |
echo $ECHO_N "checking for check.h... $ECHO_C" >&6; } |
... | ... |
@@ -13867,8 +13188,6 @@ fi |
13867 | 13867 |
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
13868 | 13868 |
conftest$ac_exeext conftest.$ac_ext |
13869 | 13869 |
|
13870 |
-else |
|
13871 |
- CHECK_LIBS= |
|
13872 | 13870 |
fi |
13873 | 13871 |
|
13874 | 13872 |
|
... | ... |
@@ -14605,6 +13924,190 @@ fi |
14605 | 14605 |
if test "$want_bzip2" = "yes" |
14606 | 14606 |
then |
14607 | 14607 |
|
14608 |
+ if test "X$prefix" = "XNONE"; then |
|
14609 |
+ acl_final_prefix="$ac_default_prefix" |
|
14610 |
+ else |
|
14611 |
+ acl_final_prefix="$prefix" |
|
14612 |
+ fi |
|
14613 |
+ if test "X$exec_prefix" = "XNONE"; then |
|
14614 |
+ acl_final_exec_prefix='${prefix}' |
|
14615 |
+ else |
|
14616 |
+ acl_final_exec_prefix="$exec_prefix" |
|
14617 |
+ fi |
|
14618 |
+ acl_save_prefix="$prefix" |
|
14619 |
+ prefix="$acl_final_prefix" |
|
14620 |
+ eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" |
|
14621 |
+ prefix="$acl_save_prefix" |
|
14622 |
+ |
|
14623 |
+ |
|
14624 |
+# Check whether --with-gnu-ld was given. |
|
14625 |
+if test "${with_gnu_ld+set}" = set; then |
|
14626 |
+ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes |
|
14627 |
+else |
|
14628 |
+ with_gnu_ld=no |
|
14629 |
+fi |
|
14630 |
+ |
|
14631 |
+# Prepare PATH_SEPARATOR. |
|
14632 |
+# The user is always right. |
|
14633 |
+if test "${PATH_SEPARATOR+set}" != set; then |
|
14634 |
+ echo "#! /bin/sh" >conf$$.sh |
|
14635 |
+ echo "exit 0" >>conf$$.sh |
|
14636 |
+ chmod +x conf$$.sh |
|
14637 |
+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then |
|
14638 |
+ PATH_SEPARATOR=';' |
|
14639 |
+ else |
|
14640 |
+ PATH_SEPARATOR=: |
|
14641 |
+ fi |
|
14642 |
+ rm -f conf$$.sh |
|
14643 |
+fi |
|
14644 |
+ac_prog=ld |
|
14645 |
+if test "$GCC" = yes; then |
|
14646 |
+ # Check if gcc -print-prog-name=ld gives a path. |
|
14647 |
+ { echo "$as_me:$LINENO: checking for ld used by GCC" >&5 |
|
14648 |
+echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6; } |
|
14649 |
+ case $host in |
|
14650 |
+ *-*-mingw*) |
|
14651 |
+ # gcc leaves a trailing carriage return which upsets mingw |
|
14652 |
+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; |
|
14653 |
+ *) |
|
14654 |
+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; |
|
14655 |
+ esac |
|
14656 |
+ case $ac_prog in |
|
14657 |
+ # Accept absolute paths. |
|
14658 |
+ [\\/]* | [A-Za-z]:[\\/]*) |
|
14659 |
+ re_direlt='/[^/][^/]*/\.\./' |
|
14660 |
+ # Canonicalize the path of ld |
|
14661 |
+ ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` |
|
14662 |
+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do |
|
14663 |
+ ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` |
|
14664 |
+ done |
|
14665 |
+ test -z "$LD" && LD="$ac_prog" |
|
14666 |
+ ;; |
|
14667 |
+ "") |
|
14668 |
+ # If it fails, then pretend we aren't using GCC. |
|
14669 |
+ ac_prog=ld |
|
14670 |
+ ;; |
|
14671 |
+ *) |
|
14672 |
+ # If it is relative, then search for the first ld in PATH. |
|
14673 |
+ with_gnu_ld=unknown |
|
14674 |
+ ;; |
|
14675 |
+ esac |
|
14676 |
+elif test "$with_gnu_ld" = yes; then |
|
14677 |
+ { echo "$as_me:$LINENO: checking for GNU ld" >&5 |
|
14678 |
+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } |
|
14679 |
+else |
|
14680 |
+ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 |
|
14681 |
+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } |
|
14682 |
+fi |
|
14683 |
+if test "${acl_cv_path_LD+set}" = set; then |
|
14684 |
+ echo $ECHO_N "(cached) $ECHO_C" >&6 |
|
14685 |
+else |
|
14686 |
+ if test -z "$LD"; then |
|
14687 |
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" |
|
14688 |
+ for ac_dir in $PATH; do |
|
14689 |
+ test -z "$ac_dir" && ac_dir=. |
|
14690 |
+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then |
|
14691 |
+ acl_cv_path_LD="$ac_dir/$ac_prog" |
|
14692 |
+ # Check to see if the program is GNU ld. I'd rather use --version, |
|
14693 |
+ # but apparently some GNU ld's only accept -v. |
|
14694 |
+ # Break only if it was the GNU/non-GNU ld that we prefer. |
|
14695 |
+ case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in |
|
14696 |
+ *GNU* | *'with BFD'*) |
|
14697 |
+ test "$with_gnu_ld" != no && break ;; |
|
14698 |
+ *) |
|
14699 |
+ test "$with_gnu_ld" != yes && break ;; |
|
14700 |
+ esac |
|
14701 |
+ fi |
|
14702 |
+ done |
|
14703 |
+ IFS="$ac_save_ifs" |
|
14704 |
+else |
|
14705 |
+ acl_cv_path_LD="$LD" # Let the user override the test with a path. |
|
14706 |
+fi |
|
14707 |
+fi |
|
14708 |
+ |
|
14709 |
+LD="$acl_cv_path_LD" |
|
14710 |
+if test -n "$LD"; then |
|
14711 |
+ { echo "$as_me:$LINENO: result: $LD" >&5 |
|
14712 |
+echo "${ECHO_T}$LD" >&6; } |
|
14713 |
+else |
|
14714 |
+ { echo "$as_me:$LINENO: result: no" >&5 |
|
14715 |
+echo "${ECHO_T}no" >&6; } |
|
14716 |
+fi |
|
14717 |
+test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 |
|
14718 |
+echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} |
|
14719 |
+ { (exit 1); exit 1; }; } |
|
14720 |
+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 |
|
14721 |
+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } |
|
14722 |
+if test "${acl_cv_prog_gnu_ld+set}" = set; then |
|
14723 |
+ echo $ECHO_N "(cached) $ECHO_C" >&6 |
|
14724 |
+else |
|
14725 |
+ # I'd rather use --version here, but apparently some GNU ld's only accept -v. |
|
14726 |
+case `$LD -v 2>&1 </dev/null` in |
|
14727 |
+*GNU* | *'with BFD'*) |
|
14728 |
+ acl_cv_prog_gnu_ld=yes ;; |
|
14729 |
+*) |
|
14730 |
+ acl_cv_prog_gnu_ld=no ;; |
|
14731 |
+esac |
|
14732 |
+fi |
|
14733 |
+{ echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5 |
|
14734 |
+echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6; } |
|
14735 |
+with_gnu_ld=$acl_cv_prog_gnu_ld |
|
14736 |
+ |
|
14737 |
+ |
|
14738 |
+ |
|
14739 |
+ |
|
14740 |
+ { echo "$as_me:$LINENO: checking for shared library run path origin" >&5 |
|
14741 |
+echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6; } |
|
14742 |
+if test "${acl_cv_rpath+set}" = set; then |
|
14743 |
+ echo $ECHO_N "(cached) $ECHO_C" >&6 |
|
14744 |
+else |
|
14745 |
+ |
|
14746 |
+ CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ |
|
14747 |
+ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh |
|
14748 |
+ . ./conftest.sh |
|
14749 |
+ rm -f ./conftest.sh |
|
14750 |
+ acl_cv_rpath=done |
|
14751 |
+ |
|
14752 |
+fi |
|
14753 |
+{ echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5 |
|
14754 |
+echo "${ECHO_T}$acl_cv_rpath" >&6; } |
|
14755 |
+ wl="$acl_cv_wl" |
|
14756 |
+ acl_libext="$acl_cv_libext" |
|
14757 |
+ acl_shlibext="$acl_cv_shlibext" |
|
14758 |
+ acl_libname_spec="$acl_cv_libname_spec" |
|
14759 |
+ acl_library_names_spec="$acl_cv_library_names_spec" |
|
14760 |
+ acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" |
|
14761 |
+ acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" |
|
14762 |
+ acl_hardcode_direct="$acl_cv_hardcode_direct" |
|
14763 |
+ acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" |
|
14764 |
+ # Check whether --enable-rpath was given. |
|
14765 |
+if test "${enable_rpath+set}" = set; then |
|
14766 |
+ enableval=$enable_rpath; : |
|
14767 |
+else |
|
14768 |
+ enable_rpath=yes |
|
14769 |
+fi |
|
14770 |
+ |
|
14771 |
+ |
|
14772 |
+ |
|
14773 |
+ acl_libdirstem=lib |
|
14774 |
+ searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` |
|
14775 |
+ if test -n "$searchpath"; then |
|
14776 |
+ acl_save_IFS="${IFS= }"; IFS=":" |
|
14777 |
+ for searchdir in $searchpath; do |
|
14778 |
+ if test -d "$searchdir"; then |
|
14779 |
+ case "$searchdir" in |
|
14780 |
+ */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; |
|
14781 |
+ *) searchdir=`cd "$searchdir" && pwd` |
|
14782 |
+ case "$searchdir" in |
|
14783 |
+ */lib64 ) acl_libdirstem=lib64 ;; |
|
14784 |
+ esac ;; |
|
14785 |
+ esac |
|
14786 |
+ fi |
|
14787 |
+ done |
|
14788 |
+ IFS="$acl_save_IFS" |
|
14789 |
+ fi |
|
14790 |
+ |
|
14791 |
+ |
|
14608 | 14792 |
|
14609 | 14793 |
|
14610 | 14794 |
|
... | ... |
@@ -21013,9 +20516,6 @@ GPERF!$GPERF$ac_delim |
21013 | 21013 |
PKG_CONFIG!$PKG_CONFIG$ac_delim |
21014 | 21014 |
CHECK_CFLAGS!$CHECK_CFLAGS$ac_delim |
21015 | 21015 |
CHECK_LIBS!$CHECK_LIBS$ac_delim |
21016 |
-LIBCHECK!$LIBCHECK$ac_delim |
|
21017 |
-LTLIBCHECK!$LTLIBCHECK$ac_delim |
|
21018 |
-LIBCHECK_PREFIX!$LIBCHECK_PREFIX$ac_delim |
|
21019 | 21016 |
GCOV!$GCOV$ac_delim |
21020 | 21017 |
LCOV!$LCOV$ac_delim |
21021 | 21018 |
GENHTML!$GENHTML$ac_delim |
... | ... |
@@ -21055,7 +20555,7 @@ LIBOBJS!$LIBOBJS$ac_delim |
21055 | 21055 |
LTLIBOBJS!$LTLIBOBJS$ac_delim |
21056 | 21056 |
_ACEOF |
21057 | 21057 |
|
21058 |
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 49; then |
|
21058 |
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 46; then |
|
21059 | 21059 |
break |
21060 | 21060 |
elif $ac_last_try; then |
21061 | 21061 |
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 |
... | ... |
@@ -330,13 +330,10 @@ _PKG_TEXT])]) |
330 | 330 |
CPPFLAGS="$CPPFLAGS $CHECK_CFLAGS" |
331 | 331 |
save_LIBS="$LIBS" |
332 | 332 |
if test -z "$CHECK_LIBS"; then |
333 |
- # when pkg-config is not available, use defaults |
|
334 |
- AC_LIB_LINKFLAGS([check]) |
|
335 |
- LIBS="$LIBS -L$LIBCHECK_PREFIX/lib -lcheck" |
|
336 |
- CHECK_LIBS="$LTLIBCHECK" |
|
337 |
- else |
|
338 |
- LIBS="$LIBS $CHECK_LIBS" |
|
333 |
+ # when pkg-config is not available, use defaults |
|
334 |
+ CHECK_LIBS="-lcheck" |
|
339 | 335 |
fi |
336 |
+ LIBS="$LIBS $CHECK_LIBS" |
|
340 | 337 |
AC_CHECK_HEADER(check.h, |
341 | 338 |
[ |
342 | 339 |
AC_MSG_CHECKING([linking with check]) |
... | ... |
@@ -351,7 +348,7 @@ _PKG_TEXT])]) |
351 | 351 |
], |
352 | 352 |
[AC_MSG_RESULT([failed]);CHECK_LIBS=] |
353 | 353 |
) |
354 |
- ],[CHECK_LIBS=]) |
|
354 |
+ ]) |
|
355 | 355 |
LIBS="$save_LIBS" |
356 | 356 |
CPPFLAGS="$save_CPPFLAGS" |
357 | 357 |
fi |
... | ... |
@@ -113,8 +113,6 @@ LCOV = @LCOV@ |
113 | 113 |
LDFLAGS = @LDFLAGS@ |
114 | 114 |
LIBBZ2 = @LIBBZ2@ |
115 | 115 |
LIBBZ2_PREFIX = @LIBBZ2_PREFIX@ |
116 |
-LIBCHECK = @LIBCHECK@ |
|
117 |
-LIBCHECK_PREFIX = @LIBCHECK_PREFIX@ |
|
118 | 116 |
LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@ |
119 | 117 |
LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@ |
120 | 118 |
LIBGMP = @LIBGMP@ |
... | ... |
@@ -124,7 +122,6 @@ LIBS = @LIBS@ |
124 | 124 |
LIBTOOL = @LIBTOOL@ |
125 | 125 |
LN_S = @LN_S@ |
126 | 126 |
LTLIBBZ2 = @LTLIBBZ2@ |
127 |
-LTLIBCHECK = @LTLIBCHECK@ |
|
128 | 127 |
LTLIBGMP = @LTLIBGMP@ |
129 | 128 |
LTLIBOBJS = @LTLIBOBJS@ |
130 | 129 |
MAINT = @MAINT@ |
... | ... |
@@ -119,8 +119,6 @@ LCOV = @LCOV@ |
119 | 119 |
LDFLAGS = @LDFLAGS@ |
120 | 120 |
LIBBZ2 = @LIBBZ2@ |
121 | 121 |
LIBBZ2_PREFIX = @LIBBZ2_PREFIX@ |
122 |
-LIBCHECK = @LIBCHECK@ |
|
123 |
-LIBCHECK_PREFIX = @LIBCHECK_PREFIX@ |
|
124 | 122 |
LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@ |
125 | 123 |
LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@ |
126 | 124 |
LIBGMP = @LIBGMP@ |
... | ... |
@@ -130,7 +128,6 @@ LIBS = @LIBS@ |
130 | 130 |
LIBTOOL = @LIBTOOL@ |
131 | 131 |
LN_S = @LN_S@ |
132 | 132 |
LTLIBBZ2 = @LTLIBBZ2@ |
133 |
-LTLIBCHECK = @LTLIBCHECK@ |
|
134 | 133 |
LTLIBGMP = @LTLIBGMP@ |
135 | 134 |
LTLIBOBJS = @LTLIBOBJS@ |
136 | 135 |
MAINT = @MAINT@ |
... | ... |
@@ -112,8 +112,6 @@ LCOV = @LCOV@ |
112 | 112 |
LDFLAGS = @LDFLAGS@ |
113 | 113 |
LIBBZ2 = @LIBBZ2@ |
114 | 114 |
LIBBZ2_PREFIX = @LIBBZ2_PREFIX@ |
115 |
-LIBCHECK = @LIBCHECK@ |
|
116 |
-LIBCHECK_PREFIX = @LIBCHECK_PREFIX@ |
|
117 | 115 |
LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@ |
118 | 116 |
LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@ |
119 | 117 |
LIBGMP = @LIBGMP@ |
... | ... |
@@ -123,7 +121,6 @@ LIBS = @LIBS@ |
123 | 123 |
LIBTOOL = @LIBTOOL@ |
124 | 124 |
LN_S = @LN_S@ |
125 | 125 |
LTLIBBZ2 = @LTLIBBZ2@ |
126 |
-LTLIBCHECK = @LTLIBCHECK@ |
|
127 | 126 |
LTLIBGMP = @LTLIBGMP@ |
128 | 127 |
LTLIBOBJS = @LTLIBOBJS@ |
129 | 128 |
MAINT = @MAINT@ |
... | ... |
@@ -140,8 +140,6 @@ LCOV = @LCOV@ |
140 | 140 |
LDFLAGS = @LDFLAGS@ |
141 | 141 |
LIBBZ2 = @LIBBZ2@ |
142 | 142 |
LIBBZ2_PREFIX = @LIBBZ2_PREFIX@ |
143 |
-LIBCHECK = @LIBCHECK@ |
|
144 |
-LIBCHECK_PREFIX = @LIBCHECK_PREFIX@ |
|
145 | 143 |
LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@ |
146 | 144 |
LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@ |
147 | 145 |
LIBGMP = @LIBGMP@ |
... | ... |
@@ -151,7 +149,6 @@ LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@ |
151 | 151 |
LIBTOOL = @LIBTOOL@ |
152 | 152 |
LN_S = @LN_S@ |
153 | 153 |
LTLIBBZ2 = @LTLIBBZ2@ |
154 |
-LTLIBCHECK = @LTLIBCHECK@ |
|
155 | 154 |
LTLIBGMP = @LTLIBGMP@ |
156 | 155 |
LTLIBOBJS = @LTLIBOBJS@ |
157 | 156 |
MAINT = @MAINT@ |
... | ... |
@@ -184,8 +184,6 @@ LCOV = @LCOV@ |
184 | 184 |
LDFLAGS = @LDFLAGS@ |
185 | 185 |
LIBBZ2 = @LIBBZ2@ |
186 | 186 |
LIBBZ2_PREFIX = @LIBBZ2_PREFIX@ |
187 |
-LIBCHECK = @LIBCHECK@ |
|
188 |
-LIBCHECK_PREFIX = @LIBCHECK_PREFIX@ |
|
189 | 187 |
LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@ |
190 | 188 |
LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@ |
191 | 189 |
LIBGMP = @LIBGMP@ |
... | ... |
@@ -195,7 +193,6 @@ LIBS = @LIBS@ |
195 | 195 |
LIBTOOL = @LIBTOOL@ |
196 | 196 |
LN_S = @LN_S@ |
197 | 197 |
LTLIBBZ2 = @LTLIBBZ2@ |
198 |
-LTLIBCHECK = @LTLIBCHECK@ |
|
199 | 198 |
LTLIBGMP = @LTLIBGMP@ |
200 | 199 |
LTLIBOBJS = @LTLIBOBJS@ |
201 | 200 |
MAINT = @MAINT@ |
... | ... |
@@ -132,8 +132,6 @@ LCOV = @LCOV@ |
132 | 132 |
LDFLAGS = @LDFLAGS@ |
133 | 133 |
LIBBZ2 = @LIBBZ2@ |
134 | 134 |
LIBBZ2_PREFIX = @LIBBZ2_PREFIX@ |
135 |
-LIBCHECK = @LIBCHECK@ |
|
136 |
-LIBCHECK_PREFIX = @LIBCHECK_PREFIX@ |
|
137 | 135 |
LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@ |
138 | 136 |
LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@ |
139 | 137 |
LIBGMP = @LIBGMP@ |
... | ... |
@@ -143,7 +141,6 @@ LIBS = @LIBS@ |
143 | 143 |
LIBTOOL = @LIBTOOL@ |
144 | 144 |
LN_S = @LN_S@ |
145 | 145 |
LTLIBBZ2 = @LTLIBBZ2@ |
146 |
-LTLIBCHECK = @LTLIBCHECK@ |
|
147 | 146 |
LTLIBGMP = @LTLIBGMP@ |
148 | 147 |
LTLIBOBJS = @LTLIBOBJS@ |
149 | 148 |
MAINT = @MAINT@ |
... | ... |
@@ -136,8 +136,6 @@ LCOV = @LCOV@ |
136 | 136 |
LDFLAGS = @LDFLAGS@ |
137 | 137 |
LIBBZ2 = @LIBBZ2@ |
138 | 138 |
LIBBZ2_PREFIX = @LIBBZ2_PREFIX@ |
139 |
-LIBCHECK = @LIBCHECK@ |
|
140 |
-LIBCHECK_PREFIX = @LIBCHECK_PREFIX@ |
|
141 | 139 |
LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@ |
142 | 140 |
LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@ |
143 | 141 |
LIBGMP = @LIBGMP@ |
... | ... |
@@ -147,7 +145,6 @@ LIBS = @LIBS@ |
147 | 147 |
LIBTOOL = @LIBTOOL@ |
148 | 148 |
LN_S = @LN_S@ |
149 | 149 |
LTLIBBZ2 = @LTLIBBZ2@ |
150 |
-LTLIBCHECK = @LTLIBCHECK@ |
|
151 | 150 |
LTLIBGMP = @LTLIBGMP@ |
152 | 151 |
LTLIBOBJS = @LTLIBOBJS@ |
153 | 152 |
MAINT = @MAINT@ |
... | ... |
@@ -131,8 +131,6 @@ LCOV = @LCOV@ |
131 | 131 |
LDFLAGS = @LDFLAGS@ |
132 | 132 |
LIBBZ2 = @LIBBZ2@ |
133 | 133 |
LIBBZ2_PREFIX = @LIBBZ2_PREFIX@ |
134 |
-LIBCHECK = @LIBCHECK@ |
|
135 |
-LIBCHECK_PREFIX = @LIBCHECK_PREFIX@ |
|
136 | 134 |
LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@ |
137 | 135 |
LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@ |
138 | 136 |
LIBGMP = @LIBGMP@ |
... | ... |
@@ -142,7 +140,6 @@ LIBS = @LIBS@ |
142 | 142 |
LIBTOOL = @LIBTOOL@ |
143 | 143 |
LN_S = @LN_S@ |
144 | 144 |
LTLIBBZ2 = @LTLIBBZ2@ |
145 |
-LTLIBCHECK = @LTLIBCHECK@ |
|
146 | 145 |
LTLIBGMP = @LTLIBGMP@ |
147 | 146 |
LTLIBOBJS = @LTLIBOBJS@ |
148 | 147 |
MAINT = @MAINT@ |
... | ... |
@@ -139,8 +139,6 @@ LCOV = @LCOV@ |
139 | 139 |
LDFLAGS = @LDFLAGS@ |
140 | 140 |
LIBBZ2 = @LIBBZ2@ |
141 | 141 |
LIBBZ2_PREFIX = @LIBBZ2_PREFIX@ |
142 |
-LIBCHECK = @LIBCHECK@ |
|
143 |
-LIBCHECK_PREFIX = @LIBCHECK_PREFIX@ |
|
144 | 142 |
LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@ |
145 | 143 |
LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@ |
146 | 144 |
LIBGMP = @LIBGMP@ |
... | ... |
@@ -150,7 +148,6 @@ LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@ |
150 | 150 |
LIBTOOL = @LIBTOOL@ |
151 | 151 |
LN_S = @LN_S@ |
152 | 152 |
LTLIBBZ2 = @LTLIBBZ2@ |
153 |
-LTLIBCHECK = @LTLIBCHECK@ |
|
154 | 153 |
LTLIBGMP = @LTLIBGMP@ |
155 | 154 |
LTLIBOBJS = @LTLIBOBJS@ |
156 | 155 |
MAINT = @MAINT@ |
... | ... |
@@ -94,8 +94,6 @@ LCOV = @LCOV@ |
94 | 94 |
LDFLAGS = @LDFLAGS@ |
95 | 95 |
LIBBZ2 = @LIBBZ2@ |
96 | 96 |
LIBBZ2_PREFIX = @LIBBZ2_PREFIX@ |
97 |
-LIBCHECK = @LIBCHECK@ |
|
98 |
-LIBCHECK_PREFIX = @LIBCHECK_PREFIX@ |
|
99 | 97 |
LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@ |
100 | 98 |
LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@ |
101 | 99 |
LIBGMP = @LIBGMP@ |
... | ... |
@@ -105,7 +103,6 @@ LIBS = @LIBS@ |
105 | 105 |
LIBTOOL = @LIBTOOL@ |
106 | 106 |
LN_S = @LN_S@ |
107 | 107 |
LTLIBBZ2 = @LTLIBBZ2@ |
108 |
-LTLIBCHECK = @LTLIBCHECK@ |
|
109 | 108 |
LTLIBGMP = @LTLIBGMP@ |
110 | 109 |
LTLIBOBJS = @LTLIBOBJS@ |
111 | 110 |
MAINT = @MAINT@ |
... | ... |
@@ -134,8 +134,6 @@ LCOV = @LCOV@ |
134 | 134 |
LDFLAGS = @LDFLAGS@ |
135 | 135 |
LIBBZ2 = @LIBBZ2@ |
136 | 136 |
LIBBZ2_PREFIX = @LIBBZ2_PREFIX@ |
137 |
-LIBCHECK = @LIBCHECK@ |
|
138 |
-LIBCHECK_PREFIX = @LIBCHECK_PREFIX@ |
|
139 | 137 |
LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@ |
140 | 138 |
LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@ |
141 | 139 |
LIBGMP = @LIBGMP@ |
... | ... |
@@ -145,7 +143,6 @@ LIBS = @LIBS@ |
145 | 145 |
LIBTOOL = @LIBTOOL@ |
146 | 146 |
LN_S = @LN_S@ |
147 | 147 |
LTLIBBZ2 = @LTLIBBZ2@ |
148 |
-LTLIBCHECK = @LTLIBCHECK@ |
|
149 | 148 |
LTLIBGMP = @LTLIBGMP@ |
150 | 149 |
LTLIBOBJS = @LTLIBOBJS@ |
151 | 150 |
MAINT = @MAINT@ |