From f21d304138faabaf14a6c4649cf1687cb6d8d264 Mon Sep 17 00:00:00 2001
From: Tomasz Kojm <tkojm@clamav.net>
Date: Wed, 26 Jan 2005 09:43:41 +0000
Subject: [PATCH] improve curl check

git-svn: trunk@1276
---
 clamav-devel/ChangeLog    | 4 ++++
 clamav-devel/configure    | 6 +++---
 clamav-devel/configure.in | 8 ++++----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/clamav-devel/ChangeLog b/clamav-devel/ChangeLog
index 1308c02d6..687388518 100644
--- a/clamav-devel/ChangeLog
+++ b/clamav-devel/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jan 26 10:38:08 CET 2005 (tk)
+---------------------------------
+  * configure: improve curl check (thanks to Martin Forssen <maf*appgate.com>)
+
 Wed Jan 26 10:15:47 CET 2005 (tk)
 ---------------------------------
   * shared/output.c: change output modes (more stdout output). Patch by
diff --git a/clamav-devel/configure b/clamav-devel/configure
index 01e284cf1..6a6b2b531 100755
--- a/clamav-devel/configure
+++ b/clamav-devel/configure
@@ -2192,7 +2192,7 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
 
 
 LC_CURRENT=1
-LC_REVISION=5
+LC_REVISION=6
 LC_AGE=0
 LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE"
 
@@ -11266,9 +11266,9 @@ echo $ECHO_N "checking for curl >= $check... $ECHO_C" >&6
     if eval curl-config --version 2>/dev/null >/dev/null; then
 	ver=`curl-config --version | sed -e "s/libcurl //g"`
 	hex_ver=`curl-config --vernum | tr 'a-f' 'A-F'`
-	ok=`echo "ibase=16; if($hex_ver>=$check_hex) $hex_ver else 0" | bc`
+	fail=`echo "ibase=16; if($hex_ver<$check_hex) 1" | bc`
 
-	if test x$ok != x0; then
+	if test x$fail != x1; then
 	    curl_libs=`curl-config --libs`
 	    LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS $curl_libs"
 	    my_cv_curl_vers="$ver"
diff --git a/clamav-devel/configure.in b/clamav-devel/configure.in
index 147ab5725..601907d2f 100644
--- a/clamav-devel/configure.in
+++ b/clamav-devel/configure.in
@@ -1,5 +1,5 @@
 dnl
-dnl   Copyright (C) 2002 - 2004 Tomasz Kojm <tkojm@clamav.net>
+dnl   Copyright (C) 2002 - 2005 Tomasz Kojm <tkojm@clamav.net>
 dnl   gethostbyname_r and readdir_r checks (c) COPYRIGHT MIT 1995
 dnl
 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`")
 AM_CONFIG_HEADER(clamav-config.h)
 
 LC_CURRENT=1
-LC_REVISION=5
+LC_REVISION=6
 LC_AGE=0
 LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE"
 AC_SUBST(LIBCLAMAV_VERSION)
@@ -194,9 +194,9 @@ then
     if eval curl-config --version 2>/dev/null >/dev/null; then
 	ver=`curl-config --version | sed -e "s/libcurl //g"`
 	hex_ver=`curl-config --vernum | tr 'a-f' 'A-F'`
-	ok=`echo "ibase=16; if($hex_ver>=$check_hex) $hex_ver else 0" | bc`
+	fail=`echo "ibase=16; if($hex_ver<$check_hex) 1" | bc`
 
-	if test x$ok != x0; then
+	if test x$fail != x1; then
 	    curl_libs=`curl-config --libs`
 	    LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS $curl_libs"
 	    my_cv_curl_vers="$ver"