mod_brotli: Update makefiles to use the library layout of the official

Brotli repository.

With the recent update (https://github.com/google/brotli/pull/464), the
official repository now produces pkg-config metadata files (brotli.pc),
and has a fixed library layout (libbrotlicommon/libbrotlienc/libbrotlidec)
on both Windows and Linux.  Expect this layout in the makefiles, and take
advantage of the pkg-config metadata, if it's available.

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 446c1f4e71c3f4d98808267209df739eed56ddfe..890618f4657c3e33668215886918bd44750bb1d0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,8 +58,8 @@ ELSE()
   SET(default_nghttp2_libraries "${CMAKE_INSTALL_PREFIX}/lib/nghttp2.lib")
 ENDIF()
 
-IF(EXISTS "${CMAKE_INSTALL_PREFIX}/lib/brotli_enc.lib")
-  SET(default_brotli_libraries "${CMAKE_INSTALL_PREFIX}/lib/brotli_enc.lib" "${CMAKE_INSTALL_PREFIX}/lib/brotli_common.lib")
+IF(EXISTS "${CMAKE_INSTALL_PREFIX}/lib/brotlienc.lib")
+  SET(default_brotli_libraries "${CMAKE_INSTALL_PREFIX}/lib/brotlienc.lib" "${CMAKE_INSTALL_PREFIX}/lib/brotlicommon.lib")
 ELSE()
   SET(default_brotli_libraries)
 ENDIF()

diff --git a/modules/filters/config.m4 b/modules/filters/config.m4
index 8d365d79e48ead36b19f1f7e5ce272e9a2e4b179..fd230c01c295fb978a8275f282ba10dfdb7c2c43 100644 (file)
--- a/modules/filters/config.m4
+++ b/modules/filters/config.m4
@@ -159,18 +159,20 @@ const uint8_t *o = BrotliEncoderTakeOutput((BrotliEncoderState*)0, (size_t*)0);]
       [AC_MSG_RESULT(yes)
        ap_brotli_found=yes
        ap_brotli_cflags="-I${ap_brotli_base}/include"
-       ap_brotli_libs="-L${ap_brotli_base}/lib -lbrotlienc"],
+       ap_brotli_libs="-L${ap_brotli_base}/lib -lbrotlienc -lbrotlicommon"],
       [AC_MSG_RESULT(no)]
     )
     CPPFLAGS=$ap_save_cppflags
   else
     if test -n "$PKGCONFIG"; then
-      AC_MSG_CHECKING([for Brotli library via pkg-config])
-      if $PKGCONFIG --exists "libbrotlienc"; then
+      AC_MSG_CHECKING([for Brotli library >= 1.0.0 via pkg-config])
+      if $PKGCONFIG --exists "brotli >= 1.0.0"; then
         AC_MSG_RESULT(yes)
         ap_brotli_found=yes
-        ap_brotli_cflags=`$PKGCONFIG libbrotlienc --cflags`
-        ap_brotli_libs=`$PKGCONFIG libbrotlienc --libs`
+        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])
       else
         AC_MSG_RESULT(no)
       fi