From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Sun, 17 Feb 2013 20:42:48 +0000 (-0500)
Subject: Check for libcurl >= 17.9.1
X-Git-Tag: release_3_0_0_beta1~1060
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e31d57ae947785dea5ee36f7b1889d69296a144b;p=thirdparty%2Ffreeradius-server.git

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 1e4bdf58b68..03d4e1bb3e6 100755
--- 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 b813bcaf0ef..bac5018adfb 100644
--- 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 aa1df13698f..9acd8221d86 100644
--- 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