From 935be639046a046b9f440be0456bfdb9a8a6d72a Mon Sep 17 00:00:00 2001
From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Thu, 25 Dec 2014 00:02:16 +0100
Subject: [PATCH] Revert "(Finally) move sqlite3 to separate checks" as
 suggested by @rubenk.

This reverts commit 01b94816efbc70f185c94202c6d1c9191cb916f4.
---
 configure.ac             | 20 ++++++++++++++++++--
 m4/pdns_check_sqlite3.m4 |  8 --------
 m4/pdns_with_sqlite3.m4  | 13 -------------
 3 files changed, 18 insertions(+), 23 deletions(-)
 delete mode 100644 m4/pdns_check_sqlite3.m4
 delete mode 100644 m4/pdns_with_sqlite3.m4

diff --git a/configure.ac b/configure.ac
index d414e7dc5..a67f5c5d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,7 +85,18 @@ BOOST_SERIALIZATION([mt])
 
 PDNS_ENABLE_UNIT_TESTS
 
-PDNS_WITH_SQLITE3
+dnl Allow user to require SQLite3
+AC_MSG_CHECKING([whether user requires sqlite3])
+AC_ARG_WITH([sqlite3],
+  [AS_HELP_STRING([--with-sqlite3],[include sqlite3 driver @<:@default=no@:>@])],
+  [with_sqlite3=$withval],
+  [with_sqlite3=no]
+)
+AC_MSG_RESULT([$with_sqlite3])
+
+AS_IF([test "x$with_sqlite3" != "xno"], [
+  needsqlite3=yes
+])
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_TYPE_SIZE_T
@@ -240,7 +251,6 @@ for a in $modules $dynmodules; do
       ;;
     gsqlite3)
       needsqlite3=yes
-      PDNS_CHECK_SQLITE3
       ;;
     ldap)
       PDNS_CHECK_LDAP
@@ -270,6 +280,12 @@ AM_CONDITIONAL([ORACLE],[test "x$needoracle" = "xyes"])
 AM_CONDITIONAL([LMDB],[test "x$needlmdb" = "xyes"])
 
 AM_CONDITIONAL([SQLITE3], [test "x$needsqlite3" = "xyes"])
+AS_IF([test "x$needsqlite3" = "xyes"], [
+  PKG_CHECK_MODULES([SQLITE3], [sqlite3],
+    [AC_DEFINE([HAVE_SQLITE3], [1], [Define to 1 if you have sqlite3])],
+    [AC_MSG_ERROR([Could not find libsqlite3])]
+  )
+])
 
 for a in $modules; do
   moduledirs="$moduledirs ${a}backend"
diff --git a/m4/pdns_check_sqlite3.m4 b/m4/pdns_check_sqlite3.m4
deleted file mode 100644
index e2a5e78dd..000000000
--- a/m4/pdns_check_sqlite3.m4
+++ /dev/null
@@ -1,8 +0,0 @@
-AC_DEFUN([PDNS_CHECK_SQLITE3], [
-  AS_IF([test "x$needsqlite3" = "xyes"], [
-    PKG_CHECK_MODULES([SQLITE3], [sqlite3],
-      [AC_DEFINE([HAVE_SQLITE3], [1], [Define to 1 if you have sqlite3])],
-      [AC_MSG_ERROR([Could not find libsqlite3])]
-    )
-  ])
-])
diff --git a/m4/pdns_with_sqlite3.m4 b/m4/pdns_with_sqlite3.m4
deleted file mode 100644
index 952ad101a..000000000
--- a/m4/pdns_with_sqlite3.m4
+++ /dev/null
@@ -1,13 +0,0 @@
-AC_DEFUN([PDNS_WITH_SQLITE3], [
-  AC_MSG_CHECKING([whether user requires sqlite3])
-  AC_ARG_WITH([sqlite3],
-    [AS_HELP_STRING([--with-sqlite3],[include sqlite3 driver @<:@default=no@:>@])],
-    [with_sqlite3=$withval],
-    [with_sqlite3=no]
-  )
-  AC_MSG_RESULT([$with_sqlite3])
-
-  AS_IF([test "x$with_sqlite3" != "xno"], [
-    needsqlite3=yes
-  ])
-])
-- 
2.49.0