about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2016-05-31T08·26+0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2016-05-31T08·26+0200
commit8e74d1badb4f93a076bda9da4ef8fdbb2668a082 (patch)
tree1261679ef22db6ca6ae12babd3776953d22430c0
parent5339ae4437549296836a16fcc52040762404b403 (diff)
parent78b00bbd8a993c403bb3712bddfd3815f7301b01 (diff)
Merge pull request #919 from veprbl/lzma_fix
use $(LIBLZMA_LIBS) instead of -llzma
-rw-r--r--Makefile.config.in1
-rw-r--r--src/libutil/local.mk2
2 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.config.in b/Makefile.config.in
index 3a7892e8b6bb..3e7847e365c7 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -10,6 +10,7 @@ OPENSSL_LIBS = @OPENSSL_LIBS@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 SODIUM_LIBS = @SODIUM_LIBS@
+LIBLZMA_LIBS = @LIBLZMA_LIBS@
 SQLITE3_LIBS = @SQLITE3_LIBS@
 bash = @bash@
 bindir = @bindir@
diff --git a/src/libutil/local.mk b/src/libutil/local.mk
index 98cad00d6d95..cac5c8795db7 100644
--- a/src/libutil/local.mk
+++ b/src/libutil/local.mk
@@ -6,6 +6,6 @@ libutil_DIR := $(d)
 
 libutil_SOURCES := $(wildcard $(d)/*.cc)
 
-libutil_LDFLAGS = -llzma -lbz2 -pthread $(OPENSSL_LIBS)
+libutil_LDFLAGS = $(LIBLZMA_LIBS) -lbz2 -pthread $(OPENSSL_LIBS)
 
 libutil_LIBS = libformat