Commit 7163a03a authored by Evgeny Kotkov's avatar Evgeny Kotkov
Browse files

mod_brotli: Update makefile to cope with the pkg-config layout change 

in https://github.com/google/brotli/commit/fe9f9a9

There's a typo in the upstream commit [1] (s/brotlicommon/libbrotlicommon)
that currently produces an unusable libbrotlienc.pc file, but hopefully
this is going to be fixed there.

[1] https://github.com/google/brotli/commit/fe9f9a9#diff-af3b638bc2a3e6c650974192a53c7291R409


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1779111 13f79535-47bb-0310-9956-ffa450edef68
parent 8b56c165

modules/filters/config.m4

+3 −5
Original line number Diff line number Diff line
@@ -167,13 +167,11 @@ if (o) return *o;], 
  else

    if test -n "$PKGCONFIG"; then

      AC_MSG_CHECKING([for Brotli library >= 1.0.0 via pkg-config])

      if $PKGCONFIG --exists "brotli >= 1.0.0"; then

      if $PKGCONFIG --exists "libbrotlienc >= 1.0.0"; then

        AC_MSG_RESULT(yes)

        ap_brotli_found=yes

        ap_brotli_cflags=`$PKGCONFIG brotli --cflags`

        ap_brotli_libs=`$PKGCONFIG brotli --libs`

        dnl We only support compression, drop -lbrotlidec.

        APR_REMOVEFROM(ap_brotli_libs, [-lbrotlidec])

        ap_brotli_cflags=`$PKGCONFIG libbrotlienc --cflags`

        ap_brotli_libs=`$PKGCONFIG libbrotlienc --libs`

      else

        AC_MSG_RESULT(no)

      fi