diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2018-01-02T10·31+0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-02T10·31+0100 |
| commit | 9b67f234c9b6d7496a49dc4d93fd7a51a727d52d (patch) | |
| tree | f0c7d7798cbb677a86e3679c3d82def15111f07f /configure.ac | |
| parent | 099ba37820653763fa30b7856c85c4b8fed657e0 (diff) | |
| parent | 9dd2b8ac7b8d82df8c1f3f36efb683175fd6ecee (diff) | |
Merge pull request #1768 from dtzWill/feature/brotli
use libbrotli directly when available
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index c395b8713f23..9db92ce91401 100644 --- a/configure.ac +++ b/configure.ac @@ -127,7 +127,7 @@ NEED_PROG(gzip, gzip) NEED_PROG(xz, xz) AC_PATH_PROG(dot, dot) AC_PATH_PROG(pv, pv, pv) -AC_PATH_PROG(bro, bro, bro) +AC_PATH_PROGS(brotli, brotli bro, bro) AC_PATH_PROG(lsof, lsof, lsof) @@ -176,6 +176,13 @@ AC_SUBST(HAVE_SODIUM, [$have_sodium]) PKG_CHECK_MODULES([LIBLZMA], [liblzma], [CXXFLAGS="$LIBLZMA_CFLAGS $CXXFLAGS"]) +# Look for libbrotli{enc,dec}, optional dependencies +PKG_CHECK_MODULES([LIBBROTLI], [libbrotlienc libbrotlidec], + [AC_DEFINE([HAVE_BROTLI], [1], [Whether to use libbrotli.]) + CXXFLAGS="$LIBBROTLI_CFLAGS $CXXFLAGS"] + have_brotli=1], [have_brotli=]) +AC_SUBST(HAVE_BROTLI, [$have_brotli]) + # Look for libseccomp, required for Linux sandboxing. if test "$sys_name" = linux; then PKG_CHECK_MODULES([LIBSECCOMP], [libseccomp], |