summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeny Kotkov <kotkov@apache.org>2017-04-10 15:17:07 +0000
committerEvgeny Kotkov <kotkov@apache.org>2017-04-10 15:17:07 +0000
commit48b56e9e35cb9b838d5a4971109bbccf4cc039c0 (patch)
tree61b41333d0ea91e2c56eba9332b8565d04a48032
parent5bded4caae09509298c613ae9e4cad0a4558d039 (diff)
downloadhttpd-48b56e9e35cb9b838d5a4971109bbccf4cc039c0.tar.gz
mod_brotli: Update makefile to allow using Brotli library >= 0.6.0.
The 0.6.0 version has just been released [1], and it contains the necessary API required for mod_brotli. [1] https://github.com/google/brotli/releases/tag/v0.6.0 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790852 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--modules/filters/config.m46
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/filters/config.m4 b/modules/filters/config.m4
index 5f41771555..0ea0826344 100644
--- a/modules/filters/config.m4
+++ b/modules/filters/config.m4
@@ -151,7 +151,7 @@ APACHE_MODULE(brotli, Brotli compression support, , , most, [
if test -n "$ap_brotli_base"; then
ap_save_cppflags=$CPPFLAGS
APR_ADDTO(CPPFLAGS, [-I${ap_brotli_base}/include])
- AC_MSG_CHECKING([for Brotli library >= 1.0.0 via prefix])
+ AC_MSG_CHECKING([for Brotli library >= 0.6.0 via prefix])
AC_TRY_COMPILE(
[#include <brotli/encode.h>],[
const uint8_t *o = BrotliEncoderTakeOutput((BrotliEncoderState*)0, (size_t*)0);
@@ -165,8 +165,8 @@ if (o) return *o;],
CPPFLAGS=$ap_save_cppflags
else
if test -n "$PKGCONFIG"; then
- AC_MSG_CHECKING([for Brotli library >= 1.0.0 via pkg-config])
- if $PKGCONFIG --exists "libbrotlienc >= 1.0.0"; then
+ AC_MSG_CHECKING([for Brotli library >= 0.6.0 via pkg-config])
+ if $PKGCONFIG --exists "libbrotlienc >= 0.6.0"; then
AC_MSG_RESULT(yes)
ap_brotli_found=yes
ap_brotli_cflags=`$PKGCONFIG libbrotlienc --cflags`