diff options
| author | Evgeny Kotkov <kotkov@apache.org> | 2017-01-16 21:43:17 +0000 |
|---|---|---|
| committer | Evgeny Kotkov <kotkov@apache.org> | 2017-01-16 21:43:17 +0000 |
| commit | 592c8f3bff4544968e3189dff73b3f00307afc3b (patch) | |
| tree | 584d47c670f370e78fc3d215d7fd26c8a0ceb642 | |
| parent | 40a9292f205ba29077f8e166d40c48e6bc52f9c8 (diff) | |
| download | httpd-592c8f3bff4544968e3189dff73b3f00307afc3b.tar.gz | |
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
| -rw-r--r-- | modules/filters/config.m4 | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/modules/filters/config.m4 b/modules/filters/config.m4 index 2d83608c00..17af1e6efc 100644 --- a/modules/filters/config.m4 +++ b/modules/filters/config.m4 @@ -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 |