From: Bert Hubert <bert.hubert@netherlabs.nl>
Date: Mon, 12 Mar 2012 07:07:44 +0000 (+0000)
Subject: make sqlite3 optional again - this commit is almost untested, but it needs to get... 
X-Git-Tag: auth-3.1-rc1~44
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9ca633e6d8c646de6a14f2ab4bf0ac0b7d4d0628;p=pdns

make sqlite3 optional again - this commit is almost untested, but it needs to get out!


git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2482 d19b8d6e-7fed-0310-83ef-9ca221ded41b
---

diff --git a/configure.ac b/configure.ac
index 85cdffba7..bb1ccf8c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -493,9 +493,10 @@ fi
 
 if test "$needsqlite3"
 then
-	PKG_CHECK_MODULES(SQLITE3, sqlite3, HAVE_SQLITE=yes, AC_MSG_ERROR([+Could not find sqlite3]))
+	PKG_CHECK_MODULES(SQLITE3, sqlite3, HAVE_SQLITE3=yes, AC_MSG_ERROR([+Could not find sqlite3]))
         AC_SUBST(SQLITE3_LIBS)
         AC_SUBST(SQLITE3_CFLAGS)
+        AC_DEFINE(HAVE_SQLITE3,1,[If we have sqlite3])
 fi
 
 if test "$needunixodbc"
diff --git a/pdns/backends/bind/binddnssec.cc b/pdns/backends/bind/binddnssec.cc
index a3bc61d29..1ad38933c 100644
--- a/pdns/backends/bind/binddnssec.cc
+++ b/pdns/backends/bind/binddnssec.cc
@@ -17,11 +17,47 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #include "bindbackend2.hh"
-#include "../../../modules/gsqlite3backend/ssqlite3.hh"
 #include "dnsrecords.hh"
 #include "bind-dnssec.schema.sqlite3.sql.h"
 #include <boost/foreach.hpp>
+#include "config.h"
 
+#ifndef HAVE_SQLITE3
+void Bind2Backend::setupDNSSEC()
+{}
+
+void Bind2Backend::createDNSSECDB(const string& fname)
+{}
+
+bool Bind2Backend::getNSEC3PARAM(const std::string& zname, NSEC3PARAMRecordContent* ns3p)
+{ return false; }
+
+bool Bind2Backend::getDomainMetadata(const string& name, const std::string& kind, std::vector<std::string>& meta)
+{ return false; }
+
+bool Bind2Backend::setDomainMetadata(const string& name, const std::string& kind, const std::vector<std::string>& meta)
+{ return false; }
+
+bool Bind2Backend::getDomainKeys(const string& name, unsigned int kind, std::vector<KeyData>& keys)
+{ return false; }
+
+bool Bind2Backend::removeDomainKey(const string& name, unsigned int id)
+{ return false; }
+
+int Bind2Backend::addDomainKey(const string& name, const KeyData& key)
+{ return false; }
+
+bool Bind2Backend::activateDomainKey(const string& name, unsigned int id)
+{ return false; }
+
+bool Bind2Backend::deactivateDomainKey(const string& name, unsigned int id)
+{ return false; }
+
+bool Bind2Backend::getTSIGKey(const string& name, string* algorithm, string* content)
+{ return false; }
+#else
+
+#include "../../../modules/gsqlite3backend/ssqlite3.hh"
 void Bind2Backend::setupDNSSEC()
 {
   // cerr<<"Settting up dnssec db.. "<<getArg("dnssec-db") <<endl;
@@ -54,7 +90,6 @@ void Bind2Backend::createDNSSECDB(const string& fname)
 bool Bind2Backend::getNSEC3PARAM(const std::string& zname, NSEC3PARAMRecordContent* ns3p)
 {
   string value;
-  
   vector<string> meta;
   getDomainMetadata(zname, "NSEC3PARAM", meta);
   if(!meta.empty())
@@ -232,3 +267,4 @@ bool Bind2Backend::getTSIGKey(const string& name, string* algorithm, string* con
   return !content->empty();
 
 }
+#endif