Check for libcurl >= 17.9.1

Disable definitions for ancient code depending on libcurl

diff --git a/src/modules/rlm_rest/configure b/src/modules/rlm_rest/configure
index 1e4bdf58b68c11d90753892f270e3e74e1832a29..03d4e1bb3e6df89cf5990c8d91ca853f875d6b70 100755 (executable)
--- a/src/modules/rlm_rest/configure
+++ b/src/modules/rlm_rest/configure
@@ -3053,11 +3053,11 @@ fi
 $as_echo "$libcurl_cv_lib_curl_version" >&6; }
 
         _libcurl_version=`echo $libcurl_cv_lib_curl_version | $_libcurl_version_parse`
-        _libcurl_wanted=`echo 0 | $_libcurl_version_parse`
+        _libcurl_wanted=`echo 7.19.1 | $_libcurl_version_parse`
 
         if test $_libcurl_wanted -gt 0 ; then
-           { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcurl >= version " >&5
-$as_echo_n "checking for libcurl >= version ... " >&6; }
+           { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcurl >= version 7.19.1" >&5
+$as_echo_n "checking for libcurl >= version 7.19.1... " >&6; }
 if ${libcurl_cv_lib_version_ok+:} false; then :
   $as_echo_n "(cached) " >&6
 else

diff --git a/src/modules/rlm_rest/configure.in b/src/modules/rlm_rest/configure.in
index b813bcaf0ef15c4073f7b50b84e0077c4db1dae8..bac5018adfbd80ddf3c9e5b98b308570ffb0218e 100644 (file)
--- a/src/modules/rlm_rest/configure.in
+++ b/src/modules/rlm_rest/configure.in
@@ -18,7 +18,7 @@ if test x$with_[]modname != xno; then
        dnl # Check for curl
        dnl ############################################################
 
-       LIBCURL_CHECK_CONFIG
+       LIBCURL_CHECK_CONFIG([], [7.19.1])
 
        if test "x$libcurl_cv_lib_curl_usable" != "xyes"; then
                fail="$fail libcurl"

diff --git a/src/modules/rlm_rest/rest.h b/src/modules/rlm_rest/rest.h
index aa1df13698f353a1ed29d64adbf7691d8b7df01d..9acd8221d86450f6c3cfca662d5be2540733d07e 100644 (file)
--- a/src/modules/rlm_rest/rest.h
+++ b/src/modules/rlm_rest/rest.h
@@ -33,6 +33,7 @@ RCSIDH(other_h, "$Id$")
 #define HAVE_JSON
 #endif
 
+#define CURL_NO_OLDIES 1
 #include <curl/curl.h>
 
 #ifdef HAVE_JSON