git-svn-id: file:///var/lib/svn/clamav-devel/trunk/clamav-devel@1276 77e5149b-7576-45b1-b177-96237e5ba77b
Tomasz Kojm authored on 2005/01/26 18:43:41... | ... |
@@ -1,3 +1,7 @@ |
1 |
+Wed Jan 26 10:38:08 CET 2005 (tk) |
|
2 |
+--------------------------------- |
|
3 |
+ * configure: improve curl check (thanks to Martin Forssen <maf*appgate.com>) |
|
4 |
+ |
|
1 | 5 |
Wed Jan 26 10:15:47 CET 2005 (tk) |
2 | 6 |
--------------------------------- |
3 | 7 |
* shared/output.c: change output modes (more stdout output). Patch by |
... | ... |
@@ -2192,7 +2192,7 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" |
2192 | 2192 |
|
2193 | 2193 |
|
2194 | 2194 |
LC_CURRENT=1 |
2195 |
-LC_REVISION=5 |
|
2195 |
+LC_REVISION=6 |
|
2196 | 2196 |
LC_AGE=0 |
2197 | 2197 |
LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE" |
2198 | 2198 |
|
... | ... |
@@ -11266,9 +11266,9 @@ echo $ECHO_N "checking for curl >= $check... $ECHO_C" >&6 |
11266 | 11266 |
if eval curl-config --version 2>/dev/null >/dev/null; then |
11267 | 11267 |
ver=`curl-config --version | sed -e "s/libcurl //g"` |
11268 | 11268 |
hex_ver=`curl-config --vernum | tr 'a-f' 'A-F'` |
11269 |
- ok=`echo "ibase=16; if($hex_ver>=$check_hex) $hex_ver else 0" | bc` |
|
11269 |
+ fail=`echo "ibase=16; if($hex_ver<$check_hex) 1" | bc` |
|
11270 | 11270 |
|
11271 |
- if test x$ok != x0; then |
|
11271 |
+ if test x$fail != x1; then |
|
11272 | 11272 |
curl_libs=`curl-config --libs` |
11273 | 11273 |
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS $curl_libs" |
11274 | 11274 |
my_cv_curl_vers="$ver" |
... | ... |
@@ -1,5 +1,5 @@ |
1 | 1 |
dnl |
2 |
-dnl Copyright (C) 2002 - 2004 Tomasz Kojm <tkojm@clamav.net> |
|
2 |
+dnl Copyright (C) 2002 - 2005 Tomasz Kojm <tkojm@clamav.net> |
|
3 | 3 |
dnl gethostbyname_r and readdir_r checks (c) COPYRIGHT MIT 1995 |
4 | 4 |
dnl |
5 | 5 |
dnl This program is free software; you can redistribute it and/or modify |
... | ... |
@@ -22,7 +22,7 @@ AM_INIT_AUTOMAKE(clamav, "devel-`date +%Y%m%d`") |
22 | 22 |
AM_CONFIG_HEADER(clamav-config.h) |
23 | 23 |
|
24 | 24 |
LC_CURRENT=1 |
25 |
-LC_REVISION=5 |
|
25 |
+LC_REVISION=6 |
|
26 | 26 |
LC_AGE=0 |
27 | 27 |
LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE" |
28 | 28 |
AC_SUBST(LIBCLAMAV_VERSION) |
... | ... |
@@ -194,9 +194,9 @@ then |
194 | 194 |
if eval curl-config --version 2>/dev/null >/dev/null; then |
195 | 195 |
ver=`curl-config --version | sed -e "s/libcurl //g"` |
196 | 196 |
hex_ver=`curl-config --vernum | tr 'a-f' 'A-F'` |
197 |
- ok=`echo "ibase=16; if($hex_ver>=$check_hex) $hex_ver else 0" | bc` |
|
197 |
+ fail=`echo "ibase=16; if($hex_ver<$check_hex) 1" | bc` |
|
198 | 198 |
|
199 |
- if test x$ok != x0; then |
|
199 |
+ if test x$fail != x1; then |
|
200 | 200 |
curl_libs=`curl-config --libs` |
201 | 201 |
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS $curl_libs" |
202 | 202 |
my_cv_curl_vers="$ver" |