From 9d6da5d71d38e7491ac2ea69cdcbe5901e48cf80 Mon Sep 17 00:00:00 2001 From: Ruben Kerkhof Date: Mon, 6 Oct 2014 23:09:58 +0200 Subject: [PATCH] Conditionalize sqlite libs --- pdns/Makefile.am | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pdns/Makefile.am b/pdns/Makefile.am index c51cdd8173..d5315156bc 100644 --- a/pdns/Makefile.am +++ b/pdns/Makefile.am @@ -7,7 +7,6 @@ AM_CXXFLAGS = \ -DPKGLIBDIR=\"$(pkglibdir)\" \ -DLOCALSTATEDIR=\"$(socketdir)\" \ $(LUA_CFLAGS) \ - $(SQLITE3_CFLAGS) \ $(POLARSSL_CFLAGS) YAHTTP_LIBS = -Lext/yahttp/yahttp -lyahttp @@ -27,6 +26,10 @@ if PKCS11 AM_CPPFLAGS += $(P11KIT1_CFLAGS) endif +if SQLITE3 +AM_CPPFLAGS += $(SQLITE3_CFLAGS) +endif + EXTRA_DIST = \ dnslabeltext.rl \ dnslabeltext.cc \ @@ -189,7 +192,6 @@ pdns_server_LDADD = \ $(POLARSSL_LIBS) \ $(BOOST_SERIALIZATION_LIBS) \ $(LUA_LIBS) \ - $(SQLITE3_LIBS) \ $(YAHTTP_LIBS) if BOTAN110 @@ -209,6 +211,7 @@ endif if SQLITE3 pdns_server_SOURCES += ssqlite3.cc ssqlite3.hh +pdns_server_LDADD += $(SQLITE3_LIBS) endif if ORACLE @@ -274,7 +277,6 @@ pdnssec_LDADD = \ $(POLARSSL_LIBS) \ $(BOOST_PROGRAM_OPTIONS_LIBS) \ $(BOOST_SERIALIZATION_LIBS) \ - $(SQLITE3_LIBS) \ $(YAHTTP_LIBS) zone2sql_SOURCES = \ @@ -410,6 +412,7 @@ endif if SQLITE3 pdnssec_SOURCES += ssqlite3.cc ssqlite3.hh +pdnssec_LDADD += $(SQLITE3_LIBS) endif if ORACLE -- 2.47.2