httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kot...@apache.org
Subject svn commit: r1779111 - /httpd/httpd/trunk/modules/filters/config.m4
Date Mon, 16 Jan 2017 21:43:17 GMT
Author: kotkov
Date: Mon Jan 16 21:43:17 2017
New Revision: 1779111

URL: http://svn.apache.org/viewvc?rev=1779111&view=rev
Log:
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

Modified:
    httpd/httpd/trunk/modules/filters/config.m4

Modified: httpd/httpd/trunk/modules/filters/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/config.m4?rev=1779111&r1=1779110&r2=1779111&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/config.m4 (original)
+++ httpd/httpd/trunk/modules/filters/config.m4 Mon Jan 16 21:43:17 2017
@@ -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



Mime
View raw message