X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=autoconf%2Fpecl%2Flibcurl.m4;h=fd0e711ec05b8b920510e068929a893ed7bf8d9b;hb=HEAD;hp=8de9499e0eaef8351c9a397a1a9e2051f66ee008;hpb=f3b5b84017131e5354aacaa01836d317dad38686;p=m6w6%2Fext-http

diff --git a/autoconf/pecl/libcurl.m4 b/autoconf/pecl/libcurl.m4
index 8de9499..7546180 100644
--- a/autoconf/pecl/libcurl.m4
+++ b/autoconf/pecl/libcurl.m4
@@ -126,38 +126,30 @@ AC_DEFUN([PECL_HAVE_LIBCURL_SSL], [dnl
 			;;
 		esac
 
-		PECL_HAVE_CONST([curl/curl.h], [CURLOPT_TLSAUTH_TYPE], int, [
-			AC_CACHE_CHECK([whether CURLOPT_TLSAUTH_TYPE expects CURL_TLSAUTH_SRP], PECL_CACHE_VAR([LIBCURL_TLSAUTH_SRP]), [
-				PECL_CACHE_VAR([LIBCURL_TLSAUTH_SRP])=
+		PECL_HAVE_CONST([curl/curl.h], [CURL_VERSION_TLSAUTH_SRP], int, [
+			AC_CACHE_CHECK([for CURLOPT_TLSAUTH_TYPE SRP support], PECL_CACHE_VAR([LIBCURL_TLSAUTH_SRP]), [
+				PECL_CACHE_VAR([LIBCURL_TLSAUTH_SRP])=no
 				AC_TRY_RUN([
 					#include <curl/curl.h>
 					int main(int argc, char *argv[]) {
-						CURL *ch = curl_easy_init();
-						return curl_easy_setopt(ch, CURLOPT_TLSAUTH_TYPE, CURL_TLSAUTH_SRP);
+						int has_feature = curl_version_info(CURLVERSION_NOW)->features & CURL_VERSION_TLSAUTH_SRP;
+						int set_failure = curl_easy_setopt(curl_easy_init(), CURLOPT_TLSAUTH_TYPE, "SRP");
+						int unset_failure = curl_easy_setopt(curl_easy_init(), CURLOPT_TLSAUTH_TYPE, "NONE");
+						fprintf(stderr, "SRP has_feature=%d set_failure=%d unset_failure=%d\n", has_feature, set_failure, unset_failure);
+						int ret = !has_feature;
+						if (set_failure)
+							ret |= 1<<1;
+						if (unset_failure)
+							ret |= 1<<2;
+
+						return ret;
 					}
 				], [
 					PECL_CACHE_VAR([LIBCURL_TLSAUTH_SRP])=yes
-				], [
-					AC_TRY_RUN([
-						#include <curl/curl.h>
-						int main(int argc, char *argv[]) {
-							CURL *ch = curl_easy_init();
-							return curl_easy_setopt(ch, CURLOPT_TLSAUTH_TYPE, "SRP");
-						}
-					], [
-						PECL_CACHE_VAR([LIBCURL_TLSAUTH_SRP])=no
-					])
 				])
 			])
-			if test -n "$PECL_CACHE_VAR([LIBCURL_TLSAUTH_SRP])"; then
+			if test "$PECL_CACHE_VAR([LIBCURL_TLSAUTH_SRP])" = "yes"; then
 				PECL_DEFINE([HAVE_LIBCURL_TLSAUTH_TYPE])
-				if $PECL_CACHE_VAR([LIBCURL_TLSAUTH_SRP]); then
-					PECL_DEFINE([LIBCURL_TLSAUTH_SRP], [CURL_TLSAUTH_SRP])
-					PECL_DEFINE([LIBCURL_TLSAUTH_DEF], [CURL_TLSAUTH_NONE])
-				else
-					PECL_DEFINE([LIBCURL_TLSAUTH_SRP], ["SRP"])
-					PECL_DEFINE([LIBCURL_TLSAUTH_DEF], [""])
-				fi
 			fi
 		])