X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=config9.m4;h=4f6d589f6078697267caa69d58c12dd651dbcfb4;hb=refs%2Fheads%2Fv3.x;hp=6a3c3e8de30163d1b75457961f0f1ede05f263bb;hpb=491f376249a5cec8c40c67dca940bf46f64e74c6;p=m6w6%2Fext-http

diff --git a/config9.m4 b/config9.m4
index 6a3c3e8..89d7b28 100644
--- a/config9.m4
+++ b/config9.m4
@@ -24,6 +24,8 @@ if test "$PHP_HTTP" != "no"; then
 		AC_CHECK_LIB(nsl, getdomainname)
 	])
 	AC_CHECK_FUNCS(mbrtowc mbtowc iswalnum inet_pton)
+	
+	CFLAGS="$CFLAGS -Wno-strict-prototypes"
 
 	dnl ZLIB
 	PHP_ARG_WITH([http-zlib-dir], [whether/where to check for zlib],
@@ -44,6 +46,8 @@ if test "$PHP_HTTP" != "no"; then
 		PECL_CHECK_LIBCURL([$PHP_HTTP_LIBCURL_DIR], [7.18.2])
 		PECL_HAVE_LIBCURL_PROTOCOL([HTTP], [
 			PECL_HAVE_LIBCURL_FEATURE([HTTP2])
+			PECL_HAVE_LIBCURL_FEATURE([ALT-SVC])
+			PECL_HAVE_LIBCURL_FEATURE([HSTS])
 			PECL_HAVE_LIBCURL_ARES
 			PECL_HAVE_LIBCURL_SSL
 			PECL_HAVE_LIBCURL_CA
@@ -87,7 +91,11 @@ if test "$PHP_HTTP" != "no"; then
 	if test "$PHP_HTTP_LIBICU_DIR" != "no"; then
 		AC_PATH_PROG(ICU_CONFIG, icu-config, false, [$PHP_HTTP_LIBICU_DIR/bin:$PATH:/usr/local/bin])
 
-		PECL_CHECK_CONFIG(libicu, [$ICU_CONFIG], [--version], [--cppflags], [--ldflags-searchpath], [--ldflags-libsonly])
+		if $ICU_CONFIG --exists >/dev/null 2>/dev/null; then
+			PECL_CHECK_CONFIG(libicu, [$ICU_CONFIG], [--version], [--cppflags], [--ldflags-searchpath], [--ldflags-libsonly])
+		else
+			PECL_CHECK_PKGCONFIG(icu-i18n, [$PHP_HTTP_LIBICU_DIR])
+		fi
 		AC_CACHE_CHECK([for uidna_IDNToASCII], PECL_CACHE_VAR([HAVE_UIDNA_IDNToASCII]), [
 			if printf "%s" "$CFLAGS" | $EGREP -q "(^|\s)-Werror\b"; then
 				if ! printf "%s" "$CFLAGS" | $EGREP -q "(^|\s)-Wno-error=deprecated-declarations\b"; then
@@ -161,6 +169,12 @@ if test "$PHP_HTTP" != "no"; then
 	], [
 		AC_MSG_ERROR([please install and enable pecl/raphf])
 	])
+	PECL_HAVE_PHP_EXT([propro], [
+		PECL_HAVE_PHP_EXT_HEADER([propro])
+	], [
+		AC_MSG_ERROR([please install and enable pecl/propro])
+	])
+	PECL_HAVE_PHP_EXT([hash])
 	PECL_HAVE_PHP_EXT([iconv])
 
 	dnl DONE
@@ -190,6 +204,7 @@ if test "$PHP_HTTP" != "no"; then
 		fi
 	fi
 	PHP_ADD_EXTENSION_DEP([http], [raphf], true)
+	PHP_ADD_EXTENSION_DEP([http], [propro], true)
 
 	PHP_SUBST(PECL_VAR([HEADERS]))
 	PHP_SUBST(PECL_VAR([SOURCES]))