X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=config9.m4;h=20e7d6c9317dac3d9417ec31a678ea9df9aac068;hp=3b1f7015554d1683469836e9548efd85b2eb0a08;hb=791511f3bc18cdc68b3f27b43d9396cf56d99e5a;hpb=4745cd2cc0c3bd610fd2fc1ef120f37ab4111d5b

diff --git a/config9.m4 b/config9.m4
index 3b1f701..20e7d6c 100644
--- a/config9.m4
+++ b/config9.m4
@@ -202,6 +202,14 @@ dnl ----
 			if test `echo $CURL_VERSION | $SED -e 's/[[^0-9]]/ /g' | $AWK '{print $1*10000 + $2*100 + $3}'` -lt 71802; then
 				AC_MSG_ERROR([libcurl version greater or equal to 7.18.2 required])
 			fi
+			
+			AC_MSG_CHECKING([for HTTP2 support in libcurl])
+			if $CURL_CONFIG --features | $EGREP -q HTTP2; then
+				AC_MSG_RESULT([yes])
+				AC_DEFINE([PHP_HTTP_HAVE_HTTP2], [1], [ ])
+			else
+				AC_MSG_RESULT([no])
+			fi
 		
 			dnl
 			dnl compile tests
@@ -210,11 +218,11 @@ dnl ----
 			save_INCLUDES="$INCLUDES"
 			INCLUDES=
 			save_LIBS="$LIBS"
-			LIBS=
+			LIBS=-lcurl
 			save_CFLAGS="$CFLAGS"
 			CFLAGS="$CFLAGS `$CURL_CONFIG --cflags`"
 			save_LDFLAGS="$LDFLAGS"
-			LDFLAGS="$LDFLAGS `$CURL_CONFIG --libs` $ld_runpath_switch$CURL_DIR/$PHP_LIBDIR"
+			LDFLAGS="$ld_runpath_switch$CURL_DIR/$PHP_LIBDIR"
 		
 			AC_MSG_CHECKING([for SSL support in libcurl])
 			CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL`
@@ -296,6 +304,37 @@ dnl ----
 			], [
 				AC_MSG_RESULT([no])
 			])
+			
+			AC_MSG_CHECKING([whether CURLOPT_TLSAUTH_TYPE expects CURL_TLSAUTH_SRP or literal "SRP"])
+			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);
+				}
+			], [
+				AC_MSG_RESULT([CURL_TLSAUTH_SRP])
+				AC_DEFINE([PHP_HTTP_CURL_TLSAUTH_SRP], [CURL_TLSAUTH_SRP], [ ])
+				AC_DEFINE([PHP_HTTP_CURL_TLSAUTH_DEF], [CURL_TLSAUTH_NONE], [ ])
+			], [
+				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");
+					}
+				], [
+					AC_MSG_RESULT(["SRP"])
+					AC_DEFINE([PHP_HTTP_CURL_TLSAUTH_SRP], ["SRP"], [ ])
+					AC_DEFINE([PHP_HTTP_CURL_TLSAUTH_DEF], [""], [ ])
+				], [
+					AC_MSG_RESULT([neither])
+				], [
+					AC_MSG_RESULT([neither])
+				])			
+			], [
+				AC_MSG_RESULT([neither])
+			])
 		
 			INCLUDES="$save_INCLUDES"
 			LIBS="$save_LIBS"