Commit 62708493 authored by Evgeny Kotkov's avatar Evgeny Kotkov
Browse files

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
parent 2367b99b

modules/filters/config.m4

+3 −3
Original line number Diff line number Diff line
@@ -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`