From e10d6ed2a7463d8a36b94bfc8769e6aea32c0efd Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 5 Jan 2019 14:25:54 -0500 Subject: [PATCH] brotli is only used as a library now --- Makefile.config.in | 1 - configure.ac | 1 - src/libutil/local.mk | 2 -- 3 files changed, 4 deletions(-) diff --git a/Makefile.config.in b/Makefile.config.in index fad077d86..b01a4afbf 100644 --- a/Makefile.config.in +++ b/Makefile.config.in @@ -18,7 +18,6 @@ LIBBROTLI_LIBS = @LIBBROTLI_LIBS@ EDITLINE_LIBS = @EDITLINE_LIBS@ bash = @bash@ bindir = @bindir@ -brotli = @brotli@ lsof = @lsof@ datadir = @datadir@ datarootdir = @datarootdir@ diff --git a/configure.ac b/configure.ac index 258919547..69aa9a946 100644 --- a/configure.ac +++ b/configure.ac @@ -128,7 +128,6 @@ NEED_PROG(gzip, gzip) NEED_PROG(xz, xz) AC_PATH_PROG(dot, dot) AC_PATH_PROG(pv, pv, pv) -AC_PATH_PROGS(brotli, brotli bro, bro) AC_PATH_PROG(lsof, lsof, lsof) diff --git a/src/libutil/local.mk b/src/libutil/local.mk index 824f48fbf..21c1e78cc 100644 --- a/src/libutil/local.mk +++ b/src/libutil/local.mk @@ -9,5 +9,3 @@ libutil_SOURCES := $(wildcard $(d)/*.cc) libutil_LDFLAGS = $(LIBLZMA_LIBS) -lbz2 -pthread $(OPENSSL_LIBS) $(LIBBROTLI_LIBS) -lboost_context libutil_LIBS = libformat - -libutil_CXXFLAGS = -DBROTLI=\"$(brotli)\"