about summary refs log tree commit diff
diff options
context:
space:
mode:
authorManuel Jacob <me@manueljacob.de>2015-10-02T11·36+0200
committerManuel Jacob <me@manueljacob.de>2015-10-06T20·28+0200
commitcbc177ca013ff9d87b36074eab9de6261f37bdaf (patch)
treeb335944f00084fc5123c635a19b837be28b8b580
parent1abda8e17311fbfc27b751b90aff4f691f496b0f (diff)
Use pkg-config-provided LDFLAGS for libsqlite3 and libcurl.
Previously, pkg-config was already queried for libsqlite3's and
libcurl's link flags.  However they were not used, but hardcoded
instead.  This commit replaces the hardcoded LDFLAGS by the ones
provided by pkg-config in a similar pattern as already used for
libsodium.
-rw-r--r--Makefile.config.in2
-rw-r--r--src/libstore/local.mk2
2 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.config.in b/Makefile.config.in
index 29ccc1b146f1..5a907b35fec1 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -5,10 +5,12 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 HAVE_OPENSSL = @HAVE_OPENSSL@
 HAVE_SODIUM = @HAVE_SODIUM@
+LIBCURL_LIBS = @LIBCURL_LIBS@
 OPENSSL_LIBS = @OPENSSL_LIBS@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 SODIUM_LIBS = @SODIUM_LIBS@
+SQLITE3_LIBS = @SQLITE3_LIBS@
 bash = @bash@
 bindir = @bindir@
 bsddiff_compat_include = @bsddiff_compat_include@
diff --git a/src/libstore/local.mk b/src/libstore/local.mk
index bf5c256c949e..08460dceb888 100644
--- a/src/libstore/local.mk
+++ b/src/libstore/local.mk
@@ -8,7 +8,7 @@ libstore_SOURCES := $(wildcard $(d)/*.cc)
 
 libstore_LIBS = libutil libformat
 
-libstore_LDFLAGS = -lsqlite3 -lbz2 -lcurl
+libstore_LDFLAGS = $(SQLITE3_LIBS) -lbz2 $(LIBCURL_LIBS)
 
 ifeq ($(OS), SunOS)
 	libstore_LDFLAGS += -lsocket