From: Ondřej Surý <ondrej@sury.org>
Date: Tue, 10 Mar 2020 11:45:36 +0000 (+0100)
Subject: Link with LMDB only where needed
X-Git-Tag: v9.17.1~44^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6a475340cfc3470850af5e4aee96d2691005a89f;p=thirdparty%2Fbind9.git

Link with LMDB only where needed
---

diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
index 4e568e29996..46c0b5dcca9 100644
--- a/bin/named/Makefile.in
+++ b/bin/named/Makefile.in
@@ -50,6 +50,7 @@ CINCLUDES =	-I${srcdir}/include -I${srcdir}/unix/include -I. \
 		${OPENSSL_CFLAGS} \
 		${JSON_C_CFLAGS} \
 		${LIBXML2_CFLAGS} \
+		${LMDB_CFLAGS} \
 		${MAXMINDDB_CFLAGS} \
 		${ZLIB_CFLAGS}
 
@@ -77,6 +78,7 @@ DEPLIBS =	${NSDEPLIBS} ${DNSDEPLIBS} ${BIND9DEPLIBS} \
 LIBS =		${NSLIBS} ${DNSLIBS} ${BIND9LIBS} \
 		${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} \
 		${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBCAP_LIBS@ \
+		${LMDB_LIBS} \
 		@LIBS@
 
 SUBDIRS =	unix
diff --git a/bin/tools/Makefile.in b/bin/tools/Makefile.in
index adfda90b0d4..8cb0679561f 100644
--- a/bin/tools/Makefile.in
+++ b/bin/tools/Makefile.in
@@ -18,7 +18,8 @@ VERSION=@BIND9_VERSION@
 CINCLUDES =	${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \
 		${BIND9_INCLUDES} \
 		${OPENSSL_CFLAGS} \
-		${MAXMINDDB_CFLAGS}
+		${MAXMINDDB_CFLAGS} \
+		${LMDB_CFLAGS}
 
 CDEFINES =	-DVERSION=\"${VERSION}\"
 CWARNINGS =
@@ -33,7 +34,7 @@ BIND9DEPLIBS =	../../lib/bind9/libbind9.@A@
 ISCDEPLIBS =	../../lib/isc/libisc.@A@
 ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@
 
-LIBS =		${ISCLIBS} @LIBS@
+LIBS =		${ISCLIBS} ${LMDB_LIBS} @LIBS@
 
 SUBDIRS =
 
diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in
index 0ef3b5f7b9f..6c206e571b1 100644
--- a/lib/dns/Makefile.in
+++ b/lib/dns/Makefile.in
@@ -31,6 +31,7 @@ CINCLUDES =	-I. -I${top_srcdir}/lib/dns -Iinclude ${DNS_INCLUDES} \
 		${OPENSSL_CFLAGS} @DST_GSSAPI_INC@ \
 		${JSON_C_CFLAGS} \
 		${LIBXML2_CFLAGS} \
+		${LMDB_CFLAGS} \
 		${MAXMINDDB_CFLAGS}
 
 CDEFINES =	@USE_GSSAPI@ ${USE_ISC_SPNEGO}
@@ -41,7 +42,7 @@ ISCLIBS =	../../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS
 
 ISCDEPLIBS =	../../lib/isc/libisc.@A@
 
-LIBS =		${MAXMINDDB_LIBS} @LIBS@
+LIBS =		${MAXMINDDB_LIBS} ${LMDB_LIBS} @LIBS@
 
 # Alphabetically
 
diff --git a/make/rules.in b/make/rules.in
index e31653d2957..e2658bffbd6 100644
--- a/make/rules.in
+++ b/make/rules.in
@@ -129,6 +129,9 @@ JSON_C_LIBS = @JSON_C_LIBS@
 LIBXML2_CFLAGS = @LIBXML2_CFLAGS@
 LIBXML2_LIBS = @LIBXML2_LIBS@
 
+LMDB_CFLAGS = @LMDB_CFLAGS@
+LMDB_LIBS = @LMDB_LIBS@
+
 MAXMINDDB_CFLAGS = @MAXMINDDB_CFLAGS@
 MAXMINDDB_LIBS = @MAXMINDDB_LIBS@