]> granicus.if.org Git - pdns/commitdiff
Conditionalize sqlite libs
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Mon, 6 Oct 2014 21:09:58 +0000 (23:09 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Wed, 8 Oct 2014 08:10:56 +0000 (10:10 +0200)
pdns/Makefile.am

index c51cdd8173bb3165d947073f428fa92280626055..d5315156bc3f29a2226b857f4c721e4376c80930 100644 (file)
@@ -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