[trafficserver] branch 8.1.x updated: Fixes autodetect of brotli

[zw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch 8.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/8.1.x by this push:
     new f58de54  Fixes autodetect of brotli
f58de54 is described below

commit f58de54b269fa52685c5c1d1a352f86eaae52793
Author: Randall Meyer <rr...@apache.org>
AuthorDate: Mon Jul 15 14:05:47 2019 -0700

    Fixes autodetect of brotli
    
    PKG_CHECK_EXISTS expects the lowercase name of the library to be
    searched for.
    
    Closes issue #5576
    
    (cherry picked from commit 3a6983fce6f8bb03698c7bcd31a4203e1fe2cc08)
---
 build/brotli.m4 | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/build/brotli.m4 b/build/brotli.m4
index b9c0261..2d35a7b 100644
--- a/build/brotli.m4
+++ b/build/brotli.m4
@@ -80,11 +80,14 @@ AC_CHECK_HEADER([brotli/encode.h], [], [has_brotli=0])
 AC_CHECK_LIB([brotlienc], BrotliEncoderCreateInstance, [:], [has_brotli=0])
 
 if test "x$has_brotli" == "x0"; then
-    PKG_CHECK_EXISTS([LIBBROTLIENC],
+    PKG_CHECK_EXISTS([libbrotlienc],
     [
       PKG_CHECK_MODULES([LIBBROTLIENC], [libbrotlienc >= 0.6.0], [
-        AC_SUBST([BROTLIENC_LIB], [$LIBBROTLIENC_LIBS])
-        AC_SUBST([BROTLIENC_CFLAGS], [$LIBBROTLIENC_CFLAGS])
+        AC_CHECK_HEADERS(brotli/encode.h, [brotli_have_headers=1])
+        if test "$brotli_have_headers" != "0"; then
+            AC_SUBST([BROTLIENC_LIB], [$LIBBROTLIENC_LIBS])
+            AC_SUBST([BROTLIENC_CFLAGS], [$LIBBROTLIENC_CFLAGS])
+        fi
       ], [])
     ], [])
 else