X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=config9.m4;h=4f6d589f6078697267caa69d58c12dd651dbcfb4;hb=8ee6bd6586270c9a0a6749d089414f28e35d22f3;hp=dda5b015fe8bc0138a2ba0f3781628be373dd500;hpb=fe48edfe1c8454750b84fd483ce4af60a5656763;p=m6w6%2Fext-http

diff --git a/config9.m4 b/config9.m4
index dda5b01..4f6d589 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],
@@ -80,7 +87,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