X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=config9.m4;h=897b92ff94ef016e551a45fe8dabe1e2ec283500;hp=1f8adabd338b4655dafdcb8b0ccba60de36cda88;hb=ba429472d56e45d8ce65d47ec0b5027f3bba4407;hpb=b4175028c2a884d5aa0359c98901629c908c6cc0 diff --git a/config9.m4 b/config9.m4 index 1f8adab..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], @@ -82,6 +89,11 @@ if test "$PHP_HTTP" != "no"; then 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 ], [