X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=config9.m4;h=897b92ff94ef016e551a45fe8dabe1e2ec283500;hp=c8e0d45330e2cab6fe3b62f6117ae69858c098d9;hb=c17987e25b6558974e60d20c4c10be9fd5221094;hpb=80bb9787a447fd8443b824f4b3f38ecf87eca9b6

diff --git a/config9.m4 b/config9.m4
index c8e0d45..897b92f 100644
--- a/config9.m4
+++ b/config9.m4
@@ -2,6 +2,7 @@
 m4_foreach(dir, [., ext/http], [
 	sinclude(dir/autoconf/pecl/pecl.m4)
 	sinclude(dir/autoconf/pecl/zlib.m4)
+	sinclude(dir/autoconf/pecl/libbrotli.m4)
 	sinclude(dir/autoconf/pecl/libcurl.m4)
 	sinclude(dir/autoconf/pecl/libevent.m4)
 ])
@@ -29,6 +30,12 @@ if test "$PHP_HTTP" != "no"; then
 	[  --with-http-zlib-dir[=DIR]         HTTP: where to find zlib], $PHP_HTTP, no)
 	PECL_CHECK_ZLIB([$PHP_HTTP_ZLIB_DIR], [1.2.0.4])
 	PECL_CHECK_DONE(zlib, $PECL_VAR([HAVE_ZLIB]))
+	
+	dnl BROTLI
+	PHP_ARG_WITH([http-libbrotli-dir], [whether/where to check for libbrotli],
+	[  --with-http-libbrotli-dir[=DIR]    HTTP: where to find libbrotli], $PHP_HTTP, no)
+	PECL_CHECK_LIBBROTLI([$PHP_HTTP_LIBBROTLI_DIR], [1.0])
+	PECL_CHECK_DONE(libbrotli, $PECL_VAR([HAVE_LIBBROTLI]))
 
 	dnl CURL
 	PHP_ARG_WITH([http-libcurl-dir], [whether/where to check for libcurl],
@@ -58,7 +65,7 @@ if test "$PHP_HTTP" != "no"; then
 	[  --with-http-libidn2-dir[=DIR]      HTTP: where to find libidn2], $PHP_HTTP_LIBCURL_DIR, no)
 	if test "$PHP_HTTP_LIBIDN2_DIR" != "no"; then
 		PECL_CHECK_CUSTOM(libidn2, "$PHP_HTTP_LIBIDN2_DIR", idn2.h, idn2,
-			[$($EGREP "define IDN2_VERSION " "$path/include/idn2.h" | $SED -e's/^.*VERSION //g' -e 's/@<:@^0-9\.@:>@//g')])
+			[$($EGREP "define IDN2_VERSION " "include/idn2.h" | $SED -e's/^.*VERSION //g' -e 's/@<:@^0-9\.@:>@//g')])
 		if $PECL_VAR([HAVE_LIBIDN2]); then
 			PECL_DEFINE([HAVE_IDNA2008])
 		fi
@@ -76,12 +83,17 @@ if test "$PHP_HTTP" != "no"; then
 
 	dnl ICU IDNA
 	PHP_ARG_WITH([http-libicu-dir], [whether/where to check for libicu],
-	[  --with-http-libidn-dir[=DIR]       HTTP: where to find libicu], $PHP_HTTP_LIBCURL_DIR, no)
+	[  --with-http-libicu-dir[=DIR]       HTTP: where to find libicu], $PHP_HTTP_LIBCURL_DIR, no)
 	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])
 		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
+					CFLAGS="$CFLAGS -Wno-error=deprecated-declarations"
+				fi
+			fi
 			AC_TRY_LINK([
 				#include <unicode/uidna.h>
 			], [
@@ -120,7 +132,7 @@ if test "$PHP_HTTP" != "no"; then
 	[  --with-http-libidnkit2-dir[=DIR]   HTTP: where to find libidnkit2], $PHP_HTTP_LIBCURL_DIR, no)
 	if test "$PHP_HTTP_LIBIDNKIT2_DIR" != "no"; then
 		PECL_CHECK_CUSTOM(libidnkit2, "$PHP_HTTP_LIBIDNKIT2_DIR", idn/api.h, idnkit,
-			[$($EGREP "define IDNKIT_VERSION_LIBIDN\b" "$path/include/idn/version.h" | $SED -e's/^.*VERSION_LIBIDN//g' -e 's/@<:@^0-9\.@:>@//g')])
+			[$($EGREP "define IDNKIT_VERSION_LIBIDN\b" "include/idn/version.h" | $SED -e's/^.*VERSION_LIBIDN//g' -e 's/@<:@^0-9\.@:>@//g')])
 		if $PECL_VAR([HAVE_LIBIDNKIT2]); then
 			PECL_DEFINE([HAVE_IDNA2008])
 		fi
@@ -135,7 +147,7 @@ if test "$PHP_HTTP" != "no"; then
 			AC_MSG_WARN([libidnkit-$PECL_VAR([LIBIDNKIT2_VERSION]) already enabled, skipping libidnkit1])
 		else
 			PECL_CHECK_CUSTOM(libidnkit, "$PHP_HTTP_LIBIDNKIT_DIR", idn/api.h, idnkit,
-				[$($EGREP "define IDNKIT_VERSION\b" "$path/include/idn/version.h" | $SED -e's/^.*VERSION//g' -e 's/@<:@^0-9\.@:>@//g')])
+				[$($EGREP "define IDNKIT_VERSION\b" "include/idn/version.h" | $SED -e's/^.*VERSION//g' -e 's/@<:@^0-9\.@:>@//g')])
 			if $PECL_VAR([HAVE_LIBIDNKIT]); then
 				PECL_DEFINE([HAVE_IDNA2003])
 			fi